Просмотр исходного кода

update 优化新增用户与角色信息、用户与岗位信息逻辑

疯狂的狮子Li лет назад: 3
Родитель
Сommit
7475cff47d

+ 5 - 27
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -381,23 +381,7 @@ public class SysUserServiceImpl implements ISysUserService
381
      */
381
      */
382
     public void insertUserRole(SysUser user)
382
     public void insertUserRole(SysUser user)
383
     {
383
     {
384
-        Long[] roles = user.getRoleIds();
385
-        if (StringUtils.isNotNull(roles))
386
-        {
387
-            // 新增用户与角色管理
388
-            List<SysUserRole> list = new ArrayList<SysUserRole>();
389
-            for (Long roleId : roles)
390
-            {
391
-                SysUserRole ur = new SysUserRole();
392
-                ur.setUserId(user.getUserId());
393
-                ur.setRoleId(roleId);
394
-                list.add(ur);
395
-            }
396
-            if (list.size() > 0)
397
-            {
398
-                userRoleMapper.batchUserRole(list);
399
-            }
400
-        }
384
+        this.insertUserRole(user.getUserId, user.getRoleIds());
401
     }
385
     }
402
 
386
 
403
     /**
387
     /**
@@ -408,7 +392,7 @@ public class SysUserServiceImpl implements ISysUserService
408
     public void insertUserPost(SysUser user)
392
     public void insertUserPost(SysUser user)
409
     {
393
     {
410
         Long[] posts = user.getPostIds();
394
         Long[] posts = user.getPostIds();
411
-        if (StringUtils.isNotNull(posts))
395
+        if (StringUtils.isNotEmpty(posts))
412
         {
396
         {
413
             // 新增用户与岗位管理
397
             // 新增用户与岗位管理
414
             List<SysUserPost> list = new ArrayList<SysUserPost>();
398
             List<SysUserPost> list = new ArrayList<SysUserPost>();
@@ -419,10 +403,7 @@ public class SysUserServiceImpl implements ISysUserService
419
                 up.setPostId(postId);
403
                 up.setPostId(postId);
420
                 list.add(up);
404
                 list.add(up);
421
             }
405
             }
422
-            if (list.size() > 0)
423
-            {
424
-                userPostMapper.batchUserPost(list);
425
-            }
406
+            userPostMapper.batchUserPost(list);
426
         }
407
         }
427
     }
408
     }
428
 
409
 
@@ -434,7 +415,7 @@ public class SysUserServiceImpl implements ISysUserService
434
      */
415
      */
435
     public void insertUserRole(Long userId, Long[] roleIds)
416
     public void insertUserRole(Long userId, Long[] roleIds)
436
     {
417
     {
437
-        if (StringUtils.isNotNull(roleIds))
418
+        if (StringUtils.isNotEmpty(roleIds))
438
         {
419
         {
439
             // 新增用户与角色管理
420
             // 新增用户与角色管理
440
             List<SysUserRole> list = new ArrayList<SysUserRole>();
421
             List<SysUserRole> list = new ArrayList<SysUserRole>();
@@ -445,10 +426,7 @@ public class SysUserServiceImpl implements ISysUserService
445
                 ur.setRoleId(roleId);
426
                 ur.setRoleId(roleId);
446
                 list.add(ur);
427
                 list.add(ur);
447
             }
428
             }
448
-            if (list.size() > 0)
449
-            {
450
-                userRoleMapper.batchUserRole(list);
451
-            }
429
+            userRoleMapper.batchUserRole(list);
452
         }
430
         }
453
     }
431
     }
454
 
432