From 71fa92e5651ce9ac25f948292e3b663fe3349930 Mon Sep 17 00:00:00 2001
From: Chendy <596813911@qq.com>
Date: Wed, 10 Sep 2025 17:42:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=89=A7?=
 =?UTF-8?q?=E6=B3=95=E4=BA=BA=E5=91=98=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/AppSystemController.java   | 60 +++++++++-----
 .../system/user/mapper/UserMapper.java        |  4 +
 .../system/user/service/IUserService.java     |  4 +
 .../system/user/service/UserServiceImpl.java  | 10 +++
 .../resources/mapper/system/UserMapper.xml    | 83 +++++++++++++++++++
 5 files changed, 138 insertions(+), 23 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java
index 402bba6d..3a9e1793 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java
@@ -130,32 +130,46 @@ public class AppSystemController extends BaseController {
                 }
             });
         }
-        //解密
-//        if(list.size() > 0){
-//            for (int i = 0; i < list.size(); i++) {
-//                String s = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, list.get(i).getPhonenumber());
-//                list.get(i).setPhonenumber(s);
-//            }
-//        }
-        // 查询出职务
-//        for (User userData : list) {
-//            List<PostBean> postBeanList = postApi.selectPostsByUserId(userData.getUserId());
-//            ArrayList<Post> postList = new ArrayList<>();
-//
-//            // 职务bean转成实体
-//            for (PostBean postBean : postBeanList) {
-//                Post post = new Post();
-//                BeanUtil.copyProperties(postBean, post);
-//                postList.add(post);
-//            }
-//
-//            if (!postList.isEmpty()) {
-//                userData.setPostList(postList);
-//            }
-//        }
         return getDataTable(list);
     }
 
+
+    /**
+     * 分页查询用户
+     * @param user
+     * @return
+     */
+    @PostMapping("/queryUsersByPage")
+    @ResponseBody
+    public TableDataInfo queryUsersByPage(@RequestBody User user) {
+        if (null != user.getNotUserId()) {
+            Map<String, Object> params = user.getParams();
+            params.put("notUserIds", Convert.toStrArray(user.getNotUserId()));
+        }
+        if (null != user.getIsShowCardId()) {
+            Map<String, Object> params = user.getParams();
+            params.put("showCardId", user.getIsShowCardId());
+        }
+        user.setDataScopeId(null);
+        int total=userService.queryUsersByPageCount(user);
+        List<User> list = userService.queryUsersByPage(user);
+        if(list.size()>0){
+            list.forEach(li->{
+                if(StringUtils.isEmpty(li.getPhonenumber()))return;
+                if(li.getPhonenumber().matches("^\\d+$")){
+                    li.setDecryptPhoneNum(li.getPhonenumber());
+                }else{
+                    li.setDecryptPhoneNum(IdCardCryptoUtil.symmetricDecryptIdCard(KEY, li.getPhonenumber()));
+                }
+            });
+        }
+        TableDataInfo rspData = getDataTable(list);
+        rspData.setCode(0);
+        rspData.setRows(list);
+        rspData.setTotal(total);
+        return rspData;
+    }
+
     @GetMapping("/listAApp")
     @ResponseBody
     public ZDResponse listAApp(User user) {
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java
index 673db43b..5277ce1a 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java
@@ -240,4 +240,8 @@ public interface UserMapper
     int updateLawCertificateNumByCertificateNumber(@Param("lawCertificateNum") String lawCertificateNum, @Param("sfzcodeEncrypt") String sfzcodeEncrypt);
 
     int updateLawCertificateNumByCertificateNumber2(String sfzcodeEncrypt);
+
+    List<User> queryUsersByPage(User user);
+
+    int queryUsersByPageCount(User user);
 }
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java
index 3319f34d..6b2b2af8 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java
@@ -267,4 +267,8 @@ public interface IUserService
     int updateLawCertificateNum(String sfzcodeEncrypt);
     int updateLawCertificateNumByCertificateNumber(String lawCertificateNum, String sfzcodeEncrypt);
     int updateLawCertificateNumByCertificateNumber2(String sfzcodeEncrypt);
+
+    List<User> queryUsersByPage(User user);
+
+    int queryUsersByPageCount(User user);
 }
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
index 10d59a4a..87e40822 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
@@ -892,4 +892,14 @@ public class UserServiceImpl implements IUserService {
         }
         return stringBuffer.toString();
     }
+
+    @Override
+    public List<User> queryUsersByPage(User user) {
+        return userMapper.queryUsersByPage(user);
+    }
+
+    @Override
+    public int queryUsersByPageCount(User user) {
+        return userMapper.queryUsersByPageCount(user);
+    }
 }
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
index 72818094..fdb7d1b1 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
@@ -819,4 +819,87 @@
         where u.del_flag = '0'
             AND u.law_certificate_num = #{lawCertificateNum}
     </select>
+    <select id="queryUsersByPage" resultType="User" parameterType="User">
+        select u.user_id, u.dept_id, u.login_name, u.user_name, u.phonenumber, u.password, d.dept_name,u.law_certificate_num
+        from sys_user u
+        left join sys_dept d on u.dept_id = d.dept_id
+        where u.del_flag = '0'
+        <if test="userId != null and userId != ''">
+            AND u.user_id = #{userId}
+        </if>
+        <if test="loginName != null and loginName != ''">
+            AND u.login_name like concat('%', #{loginName}, '%')
+        </if>
+        <if test="userName != null and userName != ''">
+            AND (
+            u.user_name like concat('%', #{userName}, '%')
+            or
+            u.law_certificate_num like concat('%', #{userName}, '%')
+            )
+        </if>
+        <if test="deptId != null and deptId != ''">
+            and u.dept_id = #{deptId}
+        </if>
+        <if test="notUserId != null and notUserId != ''">
+            and u.user_id not in
+            <foreach item="uid" collection="params.notUserIds" open="(" separator="," close=")">
+                #{uid}
+            </foreach>
+        </if>
+        <if test="params.showCardId != null and params.showCardId == 0">
+            AND (
+            (u.law_certificate_num is not null AND u.law_certificate_num !="")
+            or (d.`zone` = 5 or d.`zone` = 15)
+            or (d.parent_id in (select dept_id from sys_dept where `zone` = 5 or `zone` = 15))
+            )
+        </if>
+        and u.dept_id != 405
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
+        <if test="params.pageNum != null and params.pageSize != null">
+            LIMIT #{params.pageNum}, #{params.pageSize}
+        </if>
+    </select>
+    <select id="queryUsersByPageCount" resultType="java.lang.Integer">
+        select count(*)
+        from sys_user u
+        left join sys_dept d on u.dept_id = d.dept_id
+        where u.del_flag = '0'
+        <if test="userId != null and userId != ''">
+            AND u.user_id = #{userId}
+        </if>
+        <if test="loginName != null and loginName != ''">
+            AND u.login_name like concat('%', #{loginName}, '%')
+        </if>
+        <if test="userName != null and userName != ''">
+            AND (
+            u.user_name like concat('%', #{userName}, '%')
+            or
+            u.law_certificate_num like concat('%', #{userName}, '%')
+            )
+        </if>
+        <if test="deptId != null and deptId != ''">
+            and u.dept_id = #{deptId}
+        </if>
+        <if test="notUserId != null and notUserId != ''">
+            and u.user_id not in
+            <foreach item="uid" collection="params.notUserIds" open="(" separator="," close=")">
+                #{uid}
+            </foreach>
+        </if>
+        <if test="params.showCardId != null and params.showCardId == 0">
+            AND (
+            (u.law_certificate_num is not null AND u.law_certificate_num !="")
+            or (d.`zone` = 5 or d.`zone` = 15)
+            or (d.parent_id in (select dept_id from sys_dept where `zone` = 5 or `zone` = 15))
+            )
+        </if>
+        and u.dept_id != 405
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
+    </select>
 </mapper> 
\ No newline at end of file