Browse Source

执法端-人员查询修改

master
niujiyi 3 weeks ago
parent
commit
1360470ce1
  1. 8
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/BureauUnitController.java
  2. 2
      zdxt-modules/zdxt-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
  3. 2
      zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
  4. 2
      zdxt-modules/zdxt-system/src/main/resources/mapper/system/SysUserMapper.xml

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

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

2
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); 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);
} }

2
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) { public TableDataInfo<SysUserVo> queryUsersByPage(SysUserBo user, PageQuery pageQuery) {
Page<SysUserVo> page = pageQuery.build(); Page<SysUserVo> page = pageQuery.build();
Page<SysUserVo> result = baseMapper.queryUsersByPage(user, page); Page<SysUserVo> result = baseMapper.queryUsersByPage( page,user);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
/** /**

2
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 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 from sys_user u
left join sys_dept d on u.dept_id = d.dept_id 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 != ''"> <if test="user.userId != null and user.userId != ''">
AND u.user_id = #{user.userId} AND u.user_id = #{user.userId}
</if> </if>

Loading…
Cancel
Save