diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java index ae9013ab..071cc8a5 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java @@ -411,7 +411,7 @@ public class AppEnforcementRegistrationController extends BaseController { // 执法人员1需要展示用户名+执法码 没有执法码展示加密手机号 if (StringUtils.isNotEmpty(vo.getLawEnforcerId())) { try { - SysUserVo sysUserVo = sysUserService.selectUserById(Long.valueOf(vo.getLawEnforcerId())); + SysUserVo sysUserVo = sysUserService.queryUserById(Long.valueOf(vo.getLawEnforcerId())); if (sysUserVo != null){ String lawCN = sysUserVo.getUserName() +" "+sysUserVo.getLawCertificateNum(); if(StringUtils.isEmpty(sysUserVo.getLawCertificateNum())){ 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 1238175b..38745cad 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 @@ -151,5 +151,5 @@ public interface SysUserMapper extends BaseMapperPlus { List selectUserByIds(String[] ids); - + List queryUserByIds(String[] ids); } diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/ISysUserService.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/ISysUserService.java index ac0ca840..32545545 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -85,6 +85,7 @@ public interface ISysUserService { */ SysUserVo selectUserById(Long userId); + SysUserVo queryUserById(Long userId); /** * 通过用户ID串查询用户 * @@ -271,4 +272,5 @@ public interface ISysUserService { * @return 用户列表信息 */ List selectUserByIds(List userIds); + List queryUserByIds(List userIds); } 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 c61069d4..c5cf567e 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 @@ -195,6 +195,16 @@ public class SysUserServiceImpl implements ISysUserService, UserService { return user; } + @Override + public SysUserVo queryUserById(Long userId) { + SysUserVo user = baseMapper.selectVoById(userId); + if (ObjectUtil.isNull(user)) { + return user; + } + //user.setRoles(roleMapper.selectRolesByUserId(user.getUserId())); + return user; + } + /** * 通过用户ID串查询用户 * @@ -885,6 +895,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { public List selectUserByIds(List userIds) { return this.baseMapper.selectUserByIds(Convert.toStrArray(userIds)); } + @Override + public List queryUserByIds(List userIds) { + return this.baseMapper.selectUserByIds(Convert.toStrArray(userIds)); + } /** * 判断是否为机构 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 b3354346..a8110c64 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 @@ -154,6 +154,34 @@ where u.user_id = #{userId} + +