Эх сурвалжийг харах

refactor: 数组改成list

jay 2 жил өмнө
parent
commit
23aa49890f

+ 1 - 1
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java

@@ -261,7 +261,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PostMapping("/authRole")
-    public void insertAuthRole(Request<Long> reqUserId, Long[] roleIds) {
+    public void insertAuthRole(Request<Long> reqUserId, List<Long> roleIds) {
         Long userId = reqUserId.getData();
         userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);

+ 4 - 2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java

@@ -11,6 +11,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 用户信息业务对象 sys_user
  *
@@ -88,12 +90,12 @@ public class SysUserBo extends BaseDto {
      * 角色组
      */
     @Size(min = 1, message = "用户角色不能为空")
-    private Long[] roleIds;
+    private List<Long> roleIds;
 
     /**
      * 岗位组
      */
-    private Long[] postIds;
+    private List<Long> postIds;
 
     /**
      * 数据权限 当前角色ID

+ 1 - 1
iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysUserService.java

@@ -148,7 +148,7 @@ public interface ISysUserService {
      * @param userId  用户ID
      * @param roleIds 角色组
      */
-    void insertUserAuth(Long userId, Long[] roleIds);
+    void insertUserAuth(Long userId, List<Long> roleIds);
 
     /**
      * 修改用户状态

+ 5 - 5
iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java

@@ -174,14 +174,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      * @param clear 清除已存在的关联数据
      */
     private void insertUserPost(SysUserBo user, boolean clear) {
-        Long[] posts = user.getPostIds();
+        List<Long> posts = user.getPostIds();
         if (ArrayUtil.isNotEmpty(posts)) {
             if (clear) {
                 // 删除用户与岗位关联
                 sysUserPostData.deleteByUserId(user.getId());
             }
             // 新增用户与岗位管理
-            List<SysUserPost> list = StreamUtils.toList(List.of(posts), postId -> {
+            List<SysUserPost> list = StreamUtils.toList(posts, postId -> {
                 SysUserPost up = new SysUserPost();
                 up.setUserId(user.getId());
                 up.setPostId(postId);
@@ -198,7 +198,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      * @param roleIds 角色组
      * @param clear   清除已存在的关联数据
      */
-    private void insertUserRole(Long userId, Long[] roleIds, boolean clear) {
+    private void insertUserRole(Long userId, List<Long> roleIds, boolean clear) {
         if (ArrayUtil.isNotEmpty(roleIds)) {
             // 判断是否具有此角色的操作权限
             List<SysRole> roles = sysRoleData.selectRoleList(new SysRole());
@@ -209,7 +209,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             if (!LoginHelper.isSuperAdmin(userId)) {
                 roleList.remove(UserConstants.SUPER_ADMIN_ID);
             }
-            List<Long> canDoRoleList = StreamUtils.filter(List.of(roleIds), roleList::contains);
+            List<Long> canDoRoleList = StreamUtils.filter(roleIds, roleList::contains);
             if (CollUtil.isEmpty(canDoRoleList)) {
                 throw new BizException(ErrCode.UNAUTHORIZED_EXCEPTION);
             }
@@ -252,7 +252,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertUserAuth(Long userId, Long[] roleIds) {
+    public void insertUserAuth(Long userId, List<Long> roleIds) {
         insertUserRole(userId, roleIds, true);
     }