From f6cba2fe8f35f169fa7425da805b640c00521ff9 Mon Sep 17 00:00:00 2001
From: teddy <teddy.huang@moze.tw>
Date: Tue, 13 Apr 2021 17:03:58 +0800
Subject: [PATCH] 202104131703

---
 app/src/components/Inventory.vue               | 4 ++++
 src/main/java/com/moze/rms/dao/AccountDAO.java | 2 +-
 src/main/resources/application.properties      | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/components/Inventory.vue b/app/src/components/Inventory.vue
index 982a8b5..b128559 100644
--- a/app/src/components/Inventory.vue
+++ b/app/src/components/Inventory.vue
@@ -520,7 +520,9 @@
                 this.searchItem.tablename = this.tablename;
                 // const pattern = new RegExp('[[\\]"\';]');
                 Object.keys(this.searchItem).forEach((key) => {
+                  if (this.searchItem[key] !== null) {
                     this.searchItem[key] = this.searchItem[key].replaceAll('"', '').replaceAll('\'', '').replaceAll(';', '').replaceAll('\\', '');
+                  }
                 });
                 this.$axios.post(`/search`, this.searchItem).then((resp) => {
                     delete this.searchItem.tablename;
@@ -538,6 +540,7 @@
                         this.haveSearch = true;
                     }
                 });
+
                 this.getInventories();
             },
             async clearSearchItem() {
@@ -545,6 +548,7 @@
                 Object.keys(this.searchItem).forEach(function(key){
                     self.searchItem[key] = null;
                 });
+              console.log(this.searchItem);
                 this.getInventories();
                 this.haveSearch = false;
             },
diff --git a/src/main/java/com/moze/rms/dao/AccountDAO.java b/src/main/java/com/moze/rms/dao/AccountDAO.java
index 38d7c18..89d5d3f 100644
--- a/src/main/java/com/moze/rms/dao/AccountDAO.java
+++ b/src/main/java/com/moze/rms/dao/AccountDAO.java
@@ -38,7 +38,7 @@ public interface AccountDAO extends SqlObject {
         sql += "'" + a.getUsername() +"',";
         sql += "'" + a.getDepartment() +"',";
         sql += "'" + a.getAccount() +"',";
-        sql += "'1',";
+        sql += "'" + a.getLevel() +"',";
         sql += "'" + a.getId() +"')";
 
         handle.createUpdate(sql).execute();
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 857e529..74f9c1d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
-#spring.profiles.active=dev
-spring.profiles.active=pro
+spring.profiles.active=dev
+#spring.profiles.active=pro
 
 server.servlet.context-path=/rms
 spring.servlet.multipart.max-file-size=100MB