Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/BureauUnitController.java

@@ -48,8 +48,8 @@ public class BureauUnitController {
     /**
      * 查询用户列表
      */
-    @PostMapping("/queryUsersByPage")
-    public TableDataInfo<SysUserVo> queryUsersByPage(@RequestBody SysUserBo user, PageQuery pageQuery) {
+    @GetMapping("/queryUsersByPage")
+    public TableDataInfo<SysUserVo> queryUsersByPage(SysUserBo user, PageQuery pageQuery) {
         if (null != user.getNotUserId()) {
             Map<String, Object> params = user.getParams();
             params.put("notUserIds", Convert.toStrArray(user.getNotUserId()));
@@ -69,9 +69,9 @@ public class BureauUnitController {
                     return;
                 }
                 if (li.getPhonenumber().matches("^\\d+$")) {
-                    li.setDecryptPhoneNum(li.getPhonenumber());
+                    li.setPhonenumber(li.getPhonenumber());
                 } else {
-                    li.setDecryptPhoneNum(IdCardCryptoUtil.symmetricDecryptIdCard(KEY, li.getPhonenumber()));
+                    li.setPhonenumber(IdCardCryptoUtil.symmetricDecryptIdCard(KEY, li.getPhonenumber()));
                 }
             });
         }

zdxt-modules/zdxt-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java

@@ -155,5 +155,5 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
 
     List<SysUserVo> queryUserByIds(String[] ids);
 
-    Page<SysUserVo> queryUsersByPage(@Param("user") SysUserBo user,  Page<SysUserVo> page);
+    Page<SysUserVo> queryUsersByPage(@Param("page") Page<SysUserVo> page, @Param("user") SysUserBo user);
 }

zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -812,7 +812,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     public TableDataInfo<SysUserVo> queryUsersByPage(SysUserBo user, PageQuery pageQuery) {
 
         Page<SysUserVo> page = pageQuery.build();
-        Page<SysUserVo> result = baseMapper.queryUsersByPage(user, page);
+        Page<SysUserVo> result = baseMapper.queryUsersByPage( page,user);
         return TableDataInfo.build(result);
     }
     /**

zdxt-modules/zdxt-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -110,7 +110,7 @@
         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'
+        where u.del_flag = '0' and u.user_name != 'admin'
         <if test="user.userId != null and user.userId != ''">
             AND u.user_id = #{user.userId}
         </if>