| 
					
				 | 
			
			
				@@ -381,23 +381,7 @@ public class SysUserServiceImpl implements ISysUserService 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public void insertUserRole(SysUser user)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        Long[] roles = user.getRoleIds();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (StringUtils.isNotNull(roles))
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // 新增用户与角色管理
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            List<SysUserRole> list = new ArrayList<SysUserRole>();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            for (Long roleId : roles)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                SysUserRole ur = new SysUserRole();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                ur.setUserId(user.getUserId());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                ur.setRoleId(roleId);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                list.add(ur);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (list.size() > 0)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                userRoleMapper.batchUserRole(list);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.insertUserRole(user.getUserId, user.getRoleIds());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /**
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -408,10 +392,10 @@ public class SysUserServiceImpl implements ISysUserService 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public void insertUserPost(SysUser user)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Long[] posts = user.getPostIds();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (StringUtils.isNotNull(posts))
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (StringUtils.isNotEmpty(posts))
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 新增用户与岗位管理
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            List<SysUserPost> list = new ArrayList<SysUserPost>();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (Long postId : posts)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 SysUserPost up = new SysUserPost();
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -419,10 +403,7 @@ public class SysUserServiceImpl implements ISysUserService 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 up.setPostId(postId);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 list.add(up);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (list.size() > 0)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                userPostMapper.batchUserPost(list);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            userPostMapper.batchUserPost(list);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -434,10 +415,10 @@ public class SysUserServiceImpl implements ISysUserService 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public void insertUserRole(Long userId, Long[] roleIds)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (StringUtils.isNotNull(roleIds))
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (StringUtils.isNotEmpty(roleIds))
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 新增用户与角色管理
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            List<SysUserRole> list = new ArrayList<SysUserRole>();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (Long roleId : roleIds)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 SysUserRole ur = new SysUserRole();
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -445,10 +426,7 @@ public class SysUserServiceImpl implements ISysUserService 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 ur.setRoleId(roleId);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 list.add(ur);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (list.size() > 0)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                userRoleMapper.batchUserRole(list);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            userRoleMapper.batchUserRole(list);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 |