|
|
|
@ -285,7 +285,6 @@ public class PersonnelController extends CoreBaseController {
|
|
|
|
|
ValidatorBean.checkNotNull(id, "用户id 不能为空");
|
|
|
|
|
Map<String,Object> resultMap = new HashMap<>();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SysUser user = personnelService.getSysUserById(Long.parseLong(id));
|
|
|
|
|
|
|
|
|
|
List<SysRefUserDepartment> refUserInfoDepartmentList = personnelService.findSysRefUserDepartmentById(user.getId());
|
|
|
|
@ -429,14 +428,15 @@ public class PersonnelController extends CoreBaseController {
|
|
|
|
|
public ResultBean queryRefDepartment(@RequestBody UserDetailModel model) {
|
|
|
|
|
try {
|
|
|
|
|
List<Long> idList = new ArrayList<>();
|
|
|
|
|
model.setUserDepartmentIdList(new ArrayList<String>(Arrays.asList(new String[]{"1072037153732694016"})));
|
|
|
|
|
|
|
|
|
|
List<SysRefUserDepartment> refs = personnelService.querySysRefUserDepartmentByUserDetailModel(model);
|
|
|
|
|
if(refs != null && refs.size() > 0){
|
|
|
|
|
for (SysRefUserDepartment ref : refs) {
|
|
|
|
|
if(!idList.contains(ref.getUserId())){
|
|
|
|
|
idList.add(ref.getUserId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<SysUser> result = personnelService.querySysUserByUserDetailModelOrIds(model, idList);
|
|
|
|
|
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
|
|
|
|
|