diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/BureauUnitController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/BureauUnitController.java index 34dfb987..304a1dbf 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/BureauUnitController.java +++ b/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 queryUsersByPage(@RequestBody SysUserBo user, PageQuery pageQuery) { + @GetMapping("/queryUsersByPage") + public TableDataInfo queryUsersByPage(SysUserBo user, PageQuery pageQuery) { if (null != user.getNotUserId()) { Map 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())); } }); } diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java index 98c83255..ebe31e25 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java @@ -155,5 +155,5 @@ public interface SysUserMapper extends BaseMapperPlus { List queryUserByIds(String[] ids); - Page queryUsersByPage(@Param("user") SysUserBo user, Page page); + Page queryUsersByPage(@Param("page") Page page, @Param("user") SysUserBo user); } diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index f05ccb4a..91e97d5d 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/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 queryUsersByPage(SysUserBo user, PageQuery pageQuery) { Page page = pageQuery.build(); - Page result = baseMapper.queryUsersByPage(user, page); + Page result = baseMapper.queryUsersByPage( page,user); return TableDataInfo.build(result); } /** diff --git a/zdxt-modules/zdxt-system/src/main/resources/mapper/system/SysUserMapper.xml b/zdxt-modules/zdxt-system/src/main/resources/mapper/system/SysUserMapper.xml index 51a1037c..6753eb44 100644 --- a/zdxt-modules/zdxt-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/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' AND u.user_id = #{user.userId}