|
@@ -1,6 +1,7 @@
|
|
|
package com.boman.system.service.impl;
|
|
|
|
|
|
import com.boman.common.core.exception.CustomException;
|
|
|
+import com.boman.common.core.utils.SecurityUtils;
|
|
|
import com.boman.common.core.utils.StringUtils;
|
|
|
import com.boman.common.core.utils.array.ArrayUtils;
|
|
|
import com.boman.common.core.utils.obj.ObjectUtils;
|
|
@@ -135,18 +136,21 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
|
|
|
list.removeIf(longs::contains
|
|
|
);
|
|
|
if (list.size() > 0){
|
|
|
+ List<BomanGroupUser> bomanGroupUserList = new ArrayList<>();
|
|
|
for (Long userId : list) {
|
|
|
BomanGroupUser bomanGroupUser = new BomanGroupUser();
|
|
|
bomanGroupUser.setUserId(userId);
|
|
|
bomanGroupUser.setGroupId(groupId);
|
|
|
+ bomanGroupUser.setCreateBy(SecurityUtils.getUsername());
|
|
|
SysUser user = sysUserMapper.selectUserById(userId);
|
|
|
if (user != null){
|
|
|
bomanGroupUser.setUserName(user.getUserName());
|
|
|
- groupUserMapper.insertUserGroup(bomanGroupUser);
|
|
|
+ bomanGroupUserList.add(bomanGroupUser);
|
|
|
}else {
|
|
|
return AjaxResult.error("该用户不存在");
|
|
|
}
|
|
|
}
|
|
|
+ groupUserMapper.insertUserGroup(bomanGroupUserList);
|
|
|
}
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
@@ -173,8 +177,10 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
|
|
|
public List<SysUser> selectUserByGroupId(Long groupId) {
|
|
|
//所有组对应的用户id
|
|
|
List<Long> userIds = groupUserMapper.selectGroupUserList(groupId);
|
|
|
- List<SysUser> sysUsers = sysUserMapper.selectUserByUserIds(userIds);
|
|
|
-
|
|
|
+ List<SysUser> sysUsers = new ArrayList<>();
|
|
|
+ if (userIds.size() > 0){
|
|
|
+ sysUsers = sysUserMapper.selectUserByUserIds(userIds);
|
|
|
+ }
|
|
|
return sysUsers;
|
|
|
}
|
|
|
|