更新版本20201225优化代码前

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.

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.

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>

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;
                 }
             }

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++;
                                 }
                             }
                         }