From e4f160cfdc771a9a1f20f78b65270e1a2fe845e3 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 23 九月 2022 10:18:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/system/controller/DeptController.java |   11 +++++
 src/main/webapp/views/dept/dept.html                           |   44 ++++++++++++----------
 src/main/java/com/zy/crm/manager/entity/Cstmr.java             |    1 
 src/main/resources/application.yml                             |   10 ++--
 4 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/entity/Cstmr.java b/src/main/java/com/zy/crm/manager/entity/Cstmr.java
index c5a46de..e4b515a 100644
--- a/src/main/java/com/zy/crm/manager/entity/Cstmr.java
+++ b/src/main/java/com/zy/crm/manager/entity/Cstmr.java
@@ -297,6 +297,7 @@
         return null;
     }
 
+
     public void setType0(String type0){
         if (Cools.isEmpty(type0)) {
             return;
diff --git a/src/main/java/com/zy/crm/system/controller/DeptController.java b/src/main/java/com/zy/crm/system/controller/DeptController.java
index cb904f3..dcbb4b1 100644
--- a/src/main/java/com/zy/crm/system/controller/DeptController.java
+++ b/src/main/java/com/zy/crm/system/controller/DeptController.java
@@ -109,6 +109,17 @@
                 dept.setParentName(parent.getName());
                 dept.setLevel(parent.getLevel() + 1);
             }
+        } else {
+            dept.setUuid(dept.getName());
+            List<Dept> depts = deptService.selectList(new EntityWrapper<Dept>().eq("parent_id",dept.getId()));
+            for(Dept one : depts){
+                one.setParentName(dept.getName());
+                one.setNamePath(dept.getName());
+                one.setUpdateBy(getUserId());
+                one.setUpdateTime(new Date());
+//                deptService.update(one,new EntityWrapper<Dept>().eq("parent_id",dept.getId()));
+                deptService.updateById(one);
+            }
         }
         // path
         NodeUtils nodeUtils = new NodeUtils();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 212dcdc..4242193 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,12 +9,12 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
-    username: sa
-    password: Zoneyung@zy56$
-#    url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
+#    url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
 #    username: sa
-#    password: sa@123
+#    password: Zoneyung@zy56$
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zy_crm
+    username: sa
+    password: sa@123
   mvc:
     static-path-pattern: /**
   redis:
diff --git a/src/main/webapp/views/dept/dept.html b/src/main/webapp/views/dept/dept.html
index 4b1f142..28d0c6a 100644
--- a/src/main/webapp/views/dept/dept.html
+++ b/src/main/webapp/views/dept/dept.html
@@ -217,7 +217,9 @@
                     form.val('detail', mData);
                     // 琛ㄥ崟鎻愪氦浜嬩欢
                     form.on('submit(editSubmit)', function (data) {
-                        data.field.parentId = insXmSel.getValue('valueStr');
+                        if(insXmSel != null){
+                            data.field.parentId = insXmSel.getValue('valueStr');
+                        }
                         var loadIndex = layer.load(2);
                         $.ajax({
                             url: baseUrl+"/dept/"+(mData?'update':'add')+"/auth",
@@ -240,25 +242,27 @@
                         return false;
                     });
                     // 娓叉煋涓嬫媺鏍�
-                    var insXmSel = xmSelect.render({
-                        el: '#deptParentSel',
-                        height: '250px',
-                        data: insTb.options.data,
-                        initValue: mData ? [mData.parentId] : [],
-                        model: {label: {type: 'text'}},
-                        prop: {
-                            name: 'name',
-                            value: 'id'
-                        },
-                        radio: true,
-                        clickClose: true,
-                        tree: {
-                            show: true,
-                            indent: 15,
-                            strict: false,
-                            expandedKeys: true
-                        }
-                    });
+                    if(mData == null || mData.parentId != null ) {//闈為《绾ф牴鑺傜偣锛屼笖鏄慨鏀�
+                        var insXmSel = xmSelect.render({
+                            el: '#deptParentSel',
+                            height: '250px',
+                            data: insTb.options.data,
+                            initValue: mData ? [mData.parentId] : [],
+                            model: {label: {type: 'text'}},
+                            prop: {
+                                name: 'name',
+                                value: 'id'
+                            },
+                            radio: true,
+                            clickClose: true,
+                            tree: {
+                                show: true,
+                                indent: 15,
+                                strict: false,
+                                expandedKeys: true
+                            }
+                        });
+                    }
                     // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
                     $(layero).children('.layui-layer-content').css('overflow', 'visible');
                     layui.form.render('select');

--
Gitblit v1.9.1