From 3ad2d3786305bd9e09a0289ed6fdc4d9ebdae452 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Fri, 25 Dec 2020 16:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC20201225?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/gatewayDir/gatewayIndex.jsp |   2 +-
 .../webapp/WEB-INF/views/loginDir/index.jsp   |   2 +-
 .../webapp/WEB-INF/views/userDir/user.jsp     |   2 +-
 power-admin/src/main/webapp/static/js/user.js |   4 ++--
 .../manage/service/ipml/PowerServiceImpl.java |   4 ++--
 .../service/ipml/PowerServiceImpl.class       | Bin 28867 -> 28867 bytes
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
index d332406..3d7f50c 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
@@ -545,7 +545,7 @@
     <!-- 底部版权-->
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Version</b> 20200211
+            <b>Version</b> 20201225
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.
diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
index 13a1065..a5f776b 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
@@ -278,7 +278,7 @@
     <!-- 底部版权-->
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Version</b> 20201020
+            <b>Version</b> 20201225
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.
diff --git a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
index 5080214..ec1c7f6 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
@@ -310,7 +310,7 @@
 </script>
 <script src="${path}/static/zTree_v3-master/js/jquery.ztree.core.js"></script>
 <script src="${path}/static/zTree_v3-master/js/jquery.ztree.excheck.js"></script>
-<script src="${path}/static/js/user.js?t=1"></script>
+<script src="${path}/static/js/user.js?t=2020-12-24"></script>
 <%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %>
 </body>
 </html>
\ No newline at end of file
diff --git a/power-admin/src/main/webapp/static/js/user.js b/power-admin/src/main/webapp/static/js/user.js
index da5c43c..9383fc0 100644
--- a/power-admin/src/main/webapp/static/js/user.js
+++ b/power-admin/src/main/webapp/static/js/user.js
@@ -524,7 +524,7 @@ function exportExcel(){
     var checks = $("#checks").val();
     if(checks != '') {
         checks = checks.substring(0, checks.length - 1);
-        var url = path+"/user/export?userName="+$("#user_name").val()+"&userEmail="+$("#user_email").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val()+"&checks="+checks;
+        var url = path+"/user/export?userName="+$("#user_name").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val()+"&checks="+checks+"&name="+$("#searchName").val();
         window.location.href = url;
     }else{
         Common.confirm({
@@ -532,7 +532,7 @@ function exportExcel(){
             message: "没有选中，您确定要按搜索栏条件导出?",
             operate: function (reselt) {
                 if (reselt) {
-                    var url = path+"/user/export?userName="+$("#user_name").val()+"&userEmail="+$("#user_email").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val()+"&checks="+checks;
+                    var url = path+"/user/export?userName="+$("#user_name").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val()+"&name="+$("#searchName").val();
                     window.location.href = url;
                 }
             }
diff --git a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java
index 8f3433f..4e6abb0 100644
--- a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java
+++ b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java
@@ -427,6 +427,7 @@ public class PowerServiceImpl implements PowerService  {
                             BeanUtils.copyProperties(powerSys,tree2);
                             tree2.setId(id);
                             twoLevelId = id;
+                            id++;
                             tree2.setParentId(oneLevelId);
                             tree2.setSysFlag(powerSys.getSysFlag());
                             boolean isParent = false;
@@ -455,7 +456,6 @@ public class PowerServiceImpl implements PowerService  {
                             }
                             tree2.setIsParent(isParent);
                             treeList.add(tree2);
-                            id++;
                         }
                     }
                 }
@@ -480,6 +480,7 @@ public class PowerServiceImpl implements PowerService  {
                                     BeanUtils.copyProperties(sys,tree5);
                                     tree5.setId(id);
                                     threeLevelId = id;
+                                    id++;
                                     tree5.setParentId(twoLevelId);
                                     tree5.setSysFlag(sys.getSysFlag());
                                     boolean isParent = false;
@@ -536,7 +537,6 @@ public class PowerServiceImpl implements PowerService  {
                                     }
                                     tree5.setIsParent(isParent);
                                     treeList.add(tree5);
-                                    id++;
                                 }
                             }
                         }
diff --git a/power-service/target/classes/com/manage/service/ipml/PowerServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/PowerServiceImpl.class
index 836fbc68b4080538089682e3be35d7bf42a4be92..835e8be2d12f7a7b59e8eb0e424359b9fe8dc3a7 100644
GIT binary patch
delta 482
zcmXBQO-Pe*00!{?^ZdV@ecH-iePQOoW*%112Og}*M2Ye=x)lY2LKlU=jum+^!Gb?s
zI|m(FjJ_R3TMS8pA_tvxSfdsBYMHpTvX{F3o`>i3WQ)iaks9xkV;hhj@45)Lez^KC
zRF357vd7+@wz$Uzr0C;5V@NZB2kgf~4&o7q@tC7{!Yg>n>v+annBr?>q{4IAju-M2
zUdkl0@+@-lJYLBG<mDiy<%lbHCof;ZM|BmS)C5Xu5}(y=lvM^_R1RO&48ExX7S#d*
zRl<@Au&h?`T?_os^;pq6@Kc|}svg6dzJrRM!7p7vP0!=EUcet+B6L8S2&IWpnK-pc
z(3nnI)6F{5&q%^tW4)Q;Ml;V%R&k5n%&pdAgY~)1#u&A&q>a<F9c;D-T={rg>#$f6
z(;_dt@PbCPh1!V#6XH#%?cqIV+}<AlL=dj#!p1joQN^B6yG#V0crV_G79F5d%!-2W
zRgMGVL)bN|3@@M~+%>6loD;=RjcSsqwClMGjJl(}$);#kuqHeUTN6VTb^pCCZn%+y
byWP#c7Pr)!v(bv+nxNZvXn%UKZ?^p}TS<%J

delta 486
zcmXBQO-R#m90u_3^Zee7g_+dc{6iLOy$QV#Mvy6$XnG2yOCSq&2*M!n(5W{FD%K(T
z9qZbuL(+P4MX@I7E<u?=2T`%8#ZpTnTNC?Jx6kwNoSwoo3ey<8*6LGjb=ljkX{gH)
z_>}{dY_)BK|3cy5n`5=O#~20~;69u2fIWD~G#;@Zk2!!RJcl7(L5?@^l%sg2fafZS
z7pfb1brdhvaTHV^hSdqYQfZ8;(<rL5zI3Sf!g+kuSMf<_@LAu&7o9^%=kZk+QPyMl
zrl&BgXE3MBnAZ#Vu9xw{I4qcYESe+uX)fWHxq~HBM8%BZkC{N#Okvr~P)wPymb3wt
zO;For8rwo^+v#i%YwSg?+F^$nu@hYFz*-mK8n>QxF2=PkV7=QwxC9&A7RKFfHoE=3
zbU3-GUlye(BN7X5h$0!P0dvU6>rm^$i&B1PN6=jkSCe5A*o0KDE!0M95tDcFR+>y1
z`(#|+OQ7>i%ZIRQ)H$BQ_HY;1DNf3CsHn~`oAn)cfdSv%*&B~mgjI<-xT>6VsQK>|
gx$e)jZ1y+0n*4m{u#5f{E(!gvy?e5=UE^E-0<yD=ng9R*