fuyuchuan 9 miesięcy temu
rodzic
commit
ad16d71be3

+ 3 - 3
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -13,7 +13,7 @@ import com.usky.system.service.ISysDeptService;
 import com.usky.system.service.ISysPostService;
 import com.usky.system.service.ISysRoleService;
 import com.usky.system.service.ISysUserService;
-import com.usky.system.service.vo.SysUserVO;
+import com.usky.system.service.vo.SysUserNewVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -63,9 +63,9 @@ public class SysUserController extends BaseController
      */
 //    @Log(title = "用户管理", businessType = BusinessType.OTHER)
     @GetMapping("/dUserList")
-    public ApiResult<List<SysUserVO>> dUserList(SysUser user)
+    public ApiResult<List<SysUserNewVO>> dUserList(SysUser user)
     {
-        List<SysUserVO> list = userService.dUserList(user);
+        List<SysUserNewVO> list = userService.dUserList(user);
         return ApiResult.success(list);
     }
 

+ 2 - 2
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -4,7 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.system.domain.SysUser;
 import com.usky.system.model.LoginUser;
-import com.usky.system.service.vo.SysUserVO;
+import com.usky.system.service.vo.SysUserNewVO;
 
 import java.util.List;
 
@@ -36,7 +36,7 @@ public interface ISysUserService extends CrudService<SysUser> {
      * @param user 用户信息
      * @return 用户信息集合信息
      */
-    List<SysUserVO> dUserList(SysUser user);
+    List<SysUserNewVO> dUserList(SysUser user);
 
     /**
      * 根据条件分页查询已分配用户角色列表

+ 8 - 7
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -14,6 +14,7 @@ import com.usky.system.mapper.*;
 import com.usky.system.model.LoginUser;
 import com.usky.system.service.ISysConfigService;
 import com.usky.system.service.ISysUserService;
+import com.usky.system.service.vo.SysUserNewVO;
 import com.usky.system.service.vo.UserPostVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -92,28 +93,28 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
      * @return 用户信息集合信息
      */
     @Override
-    public List<com.usky.system.service.vo.SysUserVO> dUserList(SysUser user) {
+    public List<SysUserNewVO> dUserList(SysUser user) {
         user.setTenantId(SecurityUtils.getTenantId());
         user.setUserType("00");
-        List<com.usky.system.service.vo.SysUserVO> sysUserVOS = new ArrayList<>();
+        List<SysUserNewVO> sysUserNewVOS = new ArrayList<>();
         List<SysUser> sysUsers = userMapper.selectUserList(user);
         List<Long> userIds = new ArrayList<>();
         if (!sysUsers.isEmpty()) {
             for (SysUser sysUser : sysUsers) {
-                com.usky.system.service.vo.SysUserVO sysUserVO = new com.usky.system.service.vo.SysUserVO();
+                SysUserNewVO sysUserNewVO = new SysUserNewVO();
                 try {
-                    BeanUtils.copyProperties(sysUser, sysUserVO);
+                    BeanUtils.copyProperties(sysUser, sysUserNewVO);
                 } catch (BeansException e) {
                     throw new BusinessException("dUserList方法,获取用户列表信息异常" + e);
                 }
                 userIds.add(sysUser.getUserId());
-                sysUserVOS.add(sysUserVO);
+                sysUserNewVOS.add(sysUserNewVO);
             }
             Map<Long, String> userIdToPostMap = userPostMapper.getUserPost(userIds).stream()
                     .collect(Collectors.toMap(UserPostVo::getUserId, UserPostVo::getPostName));
-            sysUserVOS.forEach(sysUserVO -> sysUserVO.setPost(userIdToPostMap.get(sysUserVO.getUserId())));
+            sysUserNewVOS.forEach(sysUserNewVO -> sysUserNewVO.setPost(userIdToPostMap.get(sysUserNewVO.getUserId())));
         }
-        return sysUserVOS;
+        return sysUserNewVOS;
     }
 
     /**

+ 1 - 1
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/SysUserNewVO.java

@@ -9,7 +9,7 @@ import lombok.Data;
  * @date 2024/8/23
  */
 @Data
-public class SysUserVO {
+public class SysUserNewVO {
     /** 用户ID */
     private Long userId;