From 912e84596bc0d64911bc6893e1746bd4458d0288 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Thu, 4 Nov 2021 15:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E8=81=8C?=
 =?UTF-8?q?=E4=BD=8D=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/webapp/WEB-INF/views/userDir/user.jsp     | 10 +++++-----
 power-admin/src/main/webapp/static/js/user.js          |  9 ++++-----
 .../src/main/resources/mapper/Power_UserMapper.xml     |  6 ++++++
 3 files changed, 15 insertions(+), 10 deletions(-)

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 66b8f3c..e6266de 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
@@ -112,10 +112,10 @@
                         <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"/>
-                    </div>--%>
+                    <div class="form-group">
+                        <label for="user_position">用户职位:</label>
+                        <input type="text" class="form-control input-sm" id="user_position" maxlength="25"/>
+                    </div>
                     <div class="form-group">
                         <label>所属角色:</label>
                         <div class=" form-group form-inline">
@@ -302,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=2021-08-20"></script>
+<script src="${path}/static/js/user.js?t=2021-11-04"></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 d2331a2..839f1a6 100644
--- a/power-admin/src/main/webapp/static/js/user.js
+++ b/power-admin/src/main/webapp/static/js/user.js
@@ -25,7 +25,7 @@ var form = '';
                     offset : params.offset, // SQL语句起始索引
                     page : (params.offset / params.limit) + 1, //当前页码
                     userName:$("#user_name").val(),
-                    userEmail:$("#user_email").val(),
+                    userPosition:$("#user_position").val(),
                     name:$("#searchName").val(),
                     searchRoleId:$("#roleId").val(),
                     deptId : $("#dept_id option:selected").val(),
@@ -77,10 +77,10 @@ var form = '';
                     title:'移动电话',
                     field:'userTel',
                 },
-                {
+                /*{
                     title:'邮箱地址',
                     field:'userEmail',
-                },
+                },*/
                 {
                     title:'用户职位',
                     field:'userPosition',
@@ -388,7 +388,6 @@ function clearForm(){
 }
 //提交更改
 $('#btn_submit').click(function () {
-    debugger
     var reUserTel = $("#re_userTel").val();
     if(reUserTel != ''){
         if(!reUserTel.match(/^1[34578]\d{9}$/)){
@@ -533,7 +532,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()+"&name="+$("#searchName").val();
+                    var url = path+"/user/export?userName="+$("#user_name").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val()+"&name="+$("#searchName").val()+"&userPosition="+$("#user_position").val();
                     window.location.href = url;
                 }
             }
diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
index 6ea35e4..9ca99bd 100644
--- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
@@ -323,6 +323,9 @@
       <if test="userEmail!=null and userEmail!=''">
         and power_user.user_email LIKE '%${userEmail}%'
       </if>
+      <if test="userPosition!=null and userPosition!=''">
+        and power_user.user_position LIKE '%${userPosition}%'
+      </if>
       <if test="effective!=null">
         and power_user.effective=${effective}
       </if>
@@ -378,6 +381,9 @@
       <if test="userEmail!=null and userEmail!=''">
         and power_user.user_email LIKE '%${userEmail}%'
       </if>
+      <if test="userPosition!=null and userPosition!=''">
+        and power_user.user_position LIKE '%${userPosition}%'
+      </if>
       <if test="effective!=null">
         and power_user.effective=${effective}
       </if>