执法端-人员重复修改

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())){

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

@@ -151,5 +151,5 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
 
     List<SysUserVo> selectUserByIds(String[] ids);
 
-
+    List<SysUserVo> queryUserByIds(String[] ids);
 }

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<SysUserVo> selectUserByIds(List<Long> userIds);
+    List<SysUserVo> queryUserByIds(List<Long> userIds);
 }

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<SysUserVo> selectUserByIds(List<Long> userIds) {
         return this.baseMapper.selectUserByIds(Convert.toStrArray(userIds));
     }
+    @Override
+    public List<SysUserVo> queryUserByIds(List<Long> userIds) {
+        return this.baseMapper.selectUserByIds(Convert.toStrArray(userIds));
+    }
 
     /**
      * 判断是否为机构

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

@@ -154,6 +154,34 @@
         where u.user_id = #{userId}
     </select>
 
+    <select id="queryUserById" parameterType="Long" resultMap="SysUserResult">
+        select
+            u.user_id,
+            u.dept_id,
+            u.login_name,
+            u.user_name,
+            u.email,
+            u.avatar,
+            u.phonenumber,
+            u.sex,
+            u.password,
+            u.law_certificate_num,
+            u.salt,
+            u.status,
+            u.del_flag,
+            u.login_ip,
+            u.login_date,
+            u.create_time,
+            u.remark,
+            u.type,
+            u.certificateNumber,
+            u.strUserId,
+            u.user_source
+        from
+        sys_user u
+        where u.user_id = #{userId}
+    </select>
+
     <select id="selectUserByIds" parameterType="string" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
         where u.user_id in