|
|
@@ -759,9 +759,9 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
|
|
|
}else {
|
|
|
sysUser.setSuperiorId(sysUser1.getUserId());
|
|
|
userMapper.insertUser(sysUser);
|
|
|
+ allUserList.add(sysUser);
|
|
|
}
|
|
|
}
|
|
|
- allUserList.add(sysUser);
|
|
|
});
|
|
|
//处理没有找到上级的账户
|
|
|
if (!notSuperList.isEmpty()){
|
|
|
@@ -773,6 +773,7 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
|
|
|
userMapper.updateUser(e);
|
|
|
});
|
|
|
}
|
|
|
+
|
|
|
//设置人员角色
|
|
|
List<SysUserRole> roleList = new ArrayList<>();
|
|
|
for (SysUser sysUser : allUserList) {
|
|
|
@@ -783,16 +784,23 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
|
|
|
}
|
|
|
//每50个执行一次批量新增
|
|
|
int maxSize = 50;
|
|
|
- if (roleList.size() > maxSize){
|
|
|
- for (int i = 0; i < listUser.size(); i += maxSize) {
|
|
|
- int end = Math.min(i + maxSize, listUser.size());
|
|
|
- List<SysUserRole> list = roleList.subList(i, end);
|
|
|
- sysUserRoleMapper.batchUserRole(list);
|
|
|
+ if (!roleList.isEmpty()){
|
|
|
+ if (roleList.size() > maxSize){
|
|
|
+ for (int i = 0; i < roleList.size(); i += maxSize) {
|
|
|
+ int end = Math.min(i + maxSize, roleList.size());
|
|
|
+ List<SysUserRole> list = roleList.subList(i, end);
|
|
|
+ sysUserRoleMapper.batchUserRole(list);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ sysUserRoleMapper.batchUserRole(roleList);
|
|
|
}
|
|
|
- }else {
|
|
|
- sysUserRoleMapper.batchUserRole(roleList);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ private void pushAddUserRole(List<SysUser> allUserList) {
|
|
|
+
|
|
|
}
|
|
|
|
|
|
private Long pushAddDep(List<pushDataDep> listDep) {
|