用户列表增加姓名查询，第三方接口返回用户集合增加所属科室名称字段

power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp

@@ -108,6 +108,10 @@
                         <label for="user_name">账号:</label>
                         <input type="text" class="form-control input-sm" id="user_name" maxlength="16"/>
                     </div>
+                    <div class="form-group">
+                        <label for="searchName">姓名:</label>
+                        <input type="text" class="form-control input-sm" id="searchName" maxlength="16"/>
+                    </div>
                    <%-- <div class="form-group">
                         <label for="user_email">邮箱地址:</label>
                         <input type="text" class="form-control input-sm" id="user_email" maxlength="25"/>
@@ -298,7 +302,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=2021-08-20"></script>
 <%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %>
 </body>
 </html>

power-admin/src/main/webapp/static/js/user.js

@@ -26,6 +26,7 @@ var form = '';
                     page : (params.offset / params.limit) + 1, //当前页码
                     userName:$("#user_name").val(),
                     userEmail:$("#user_email").val(),
+                    name:$("#searchName").val(),
                     searchRoleId:$("#roleId").val(),
                     deptId : $("#dept_id option:selected").val(),
                     effective : $("#effective option:selected").val(),
@@ -532,7 +533,7 @@ function exportExcel(){
             message: "没有选中，您确定要按搜索栏条件导出?",
             operate: function (reselt) {
                 if (reselt) {
-                    var url = path+"/user/export?userName="+$("#user_name").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val();
+                    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-dao/src/main/java/com/manage/vo/User.java

@@ -27,6 +27,16 @@ public class User {
 
     private String deptCode;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public String getDeptCode() {
         return deptCode;
     }

power-dao/src/main/resources/mapper/Power_UserMapper.xml

@@ -317,6 +317,9 @@
       <if test="userName!=null and userName!=''">
         and power_user.user_name LIKE '%${userName}%'
       </if>
+      <if test="name!=null and name!=''">
+        and power_user.name LIKE '%${name}%'
+      </if>
       <if test="userEmail!=null and userEmail!=''">
         and power_user.user_email LIKE '%${userEmail}%'
       </if>
@@ -369,6 +372,9 @@
       <if test="userName!=null and userName!=''">
         and power_user.user_name LIKE '%${userName}%'
       </if>
+      <if test="name!=null and name!=''">
+        and power_user.name LIKE '%${name}%'
+      </if>
       <if test="userEmail!=null and userEmail!=''">
         and power_user.user_email LIKE '%${userEmail}%'
       </if>
@@ -549,14 +555,19 @@
         power_user.dept_id,
         power_user.dept_code,
         power_role.role_name,
-        name
+        NAME,
+        power_dept.dept_name
     FROM
         power_user_dict
-    INNER JOIN power_user ON power_user_dict.user_id = power_user.user_id  AND power_user.effective = 1 AND power_user.role_id != 0
+    INNER JOIN power_user ON power_user_dict.user_id = power_user.user_id
-    LEFT JOIN power_role ON power_user.role_id = power_role.role_id AND power_role.effective = 1
+    AND power_user.effective = 1
+    AND power_user.role_id != 0
+    LEFT JOIN power_role ON power_user.role_id = power_role.role_id
+    AND power_role.effective = 1
+    LEFT JOIN power_dept ON power_user.dept_id = power_dept.dept_id AND power_dept.effective = 1
     <if test="userId != null and userId != ''">
         WHERE
-            dict_id = (
+            power_user_dict.dict_id = (
                 SELECT
                     dict_id
                 FROM