|
@@ -1,5 +1,6 @@
|
|
package com.xy.service.impl;
|
|
package com.xy.service.impl;
|
|
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
@@ -25,6 +26,9 @@ import lombok.RequiredArgsConstructor;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.List;
|
|
|
|
+
|
|
import static com.xy.utils.PlusBeans.toIPage;
|
|
import static com.xy.utils.PlusBeans.toIPage;
|
|
import static com.xy.utils.PlusBeans.toPageBean;
|
|
import static com.xy.utils.PlusBeans.toPageBean;
|
|
|
|
|
|
@@ -49,18 +53,29 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public R<Boolean> add(AddDto addDto) {
|
|
public R<Boolean> add(AddDto addDto) {
|
|
SysWorkUser sysWorkUser = Beans.copy(SysWorkUser.class, addDto).create(Long.parseLong(SaTokenUtils.getId().toString()));
|
|
SysWorkUser sysWorkUser = Beans.copy(SysWorkUser.class, addDto).create(Long.parseLong(SaTokenUtils.getId().toString()));
|
|
- save(sysWorkUser);
|
|
|
|
//新增业务用户
|
|
//新增业务用户
|
|
- sysUserRoleService.save(new SysUserRole()
|
|
|
|
- .setSysId(addDto.getSysId())
|
|
|
|
- .setRoleId(addDto.getRoleIds())
|
|
|
|
- .setWorkUserId(Long.parseLong(SaTokenUtils.getId().toString())));
|
|
|
|
- String deptIds = addDto.getDeptIds();
|
|
|
|
- if (StrUtil.isNotBlank(deptIds)) {
|
|
|
|
|
|
+ save(sysWorkUser);
|
|
|
|
+ List<Long> roleIds = addDto.getRoleIds();
|
|
|
|
+ if (CollUtil.isNotEmpty(roleIds)) {
|
|
|
|
+ List<SysUserRole> sysUserRoleList = new ArrayList<>(16);
|
|
|
|
+ roleIds.forEach(roleId -> {
|
|
|
|
+ sysUserRoleList.add(new SysUserRole()
|
|
|
|
+ .setRoleId(roleId).setWorkUserId(sysWorkUser.getId()).setSysId(sysWorkUser.getSysId()));
|
|
|
|
+ });
|
|
|
|
+ //保存用户角色绑定信息
|
|
|
|
+ sysUserRoleService.saveBatch(sysUserRoleList);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ List<Long> deptIds = addDto.getDeptIds();
|
|
|
|
+ if (CollUtil.isNotEmpty(deptIds)) {
|
|
//关联部门
|
|
//关联部门
|
|
- sysUserDeptService.save(
|
|
|
|
- new SysUserDept().setDeptId(deptIds).setWorkUserId(sysWorkUser.getSysUserId()).setSysId(addDto.getSysId())
|
|
|
|
- );
|
|
|
|
|
|
+ List<SysUserDept> sysUserDeptList = new ArrayList<>(16);
|
|
|
|
+ deptIds.forEach(deptId -> {
|
|
|
|
+ sysUserDeptList.add(new SysUserDept()
|
|
|
|
+ .setDeptId(deptId).setWorkUserId(sysWorkUser.getId()).setSysId(sysWorkUser.getSysId()));
|
|
|
|
+ });
|
|
|
|
+ //保存用户bumen 绑定信息
|
|
|
|
+ sysUserDeptService.saveBatch(sysUserDeptList);
|
|
}
|
|
}
|
|
return R.ok(Boolean.TRUE);
|
|
return R.ok(Boolean.TRUE);
|
|
}
|
|
}
|
|
@@ -77,7 +92,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
|
|
.eq(SysUserDept::getWorkUserId, sysWorkUser.getId())
|
|
.eq(SysUserDept::getWorkUserId, sysWorkUser.getId())
|
|
.eq(SysUserDept::getSysId, sysWorkUser.getSysId()));
|
|
.eq(SysUserDept::getSysId, sysWorkUser.getSysId()));
|
|
if (sysUserDept == null) {
|
|
if (sysUserDept == null) {
|
|
- sysUserDept = new SysUserDept().setDeptId(deptIds).setWorkUserId(sysWorkUser.getId()).setSysId(sysWorkUser.getSysId());
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
//关联部门
|
|
//关联部门
|
|
sysUserDeptService.saveOrUpdate(sysUserDept);
|
|
sysUserDeptService.saveOrUpdate(sysUserDept);
|