作者 若依
提交者 Gitee

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

Merge pull request !504 from 疯狂的狮子Li/N/A
@@ -381,23 +381,7 @@ public class SysUserServiceImpl implements ISysUserService @@ -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,10 +392,10 @@ public class SysUserServiceImpl implements ISysUserService @@ -408,10 +392,10 @@ 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>(posts.length);
415 for (Long postId : posts) 399 for (Long postId : posts)
416 { 400 {
417 SysUserPost up = new SysUserPost(); 401 SysUserPost up = new SysUserPost();
@@ -419,12 +403,9 @@ public class SysUserServiceImpl implements ISysUserService @@ -419,12 +403,9 @@ 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); 406 userPostMapper.batchUserPost(list);
425 } 407 }
426 } 408 }
427 - }  
428 409
429 /** 410 /**
430 * 新增用户角色信息 411 * 新增用户角色信息
@@ -434,10 +415,10 @@ public class SysUserServiceImpl implements ISysUserService @@ -434,10 +415,10 @@ 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>(roleIds.length);
441 for (Long roleId : roleIds) 422 for (Long roleId : roleIds)
442 { 423 {
443 SysUserRole ur = new SysUserRole(); 424 SysUserRole ur = new SysUserRole();
@@ -445,12 +426,9 @@ public class SysUserServiceImpl implements ISysUserService @@ -445,12 +426,9 @@ 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); 429 userRoleMapper.batchUserRole(list);
451 } 430 }
452 } 431 }
453 - }  
454 432
455 /** 433 /**
456 * 通过用户ID删除用户 434 * 通过用户ID删除用户