简柏林 / thingskit · Commits

Commit d817e6be1377bec48e3762da3c739f2fe3d8031a

Authored by 房远帅
1 parent d57bc148

选人组件-接口返回新增组织id

Inline Side-by-side
Showing 2 changed files with 8 additions and 0 deletions
@@ -85,6 +85,9 @@ public class UserDTO extends BaseDTO { @@ -85,6 +85,9 @@ public class UserDTO extends BaseDTO {
85 @ApiModelProperty(value = "备注") 85 @ApiModelProperty(value = "备注")
86 private String remark; 86 private String remark;
87 87
  88 + @ApiModelProperty(value = "第一个部门id")
  89 + private String organizationId;
  90 +
88 public UserDTO newOpenApiUser(String tenantId ,String userName){ 91 public UserDTO newOpenApiUser(String tenantId ,String userName){
89 UserDTO dto = new UserDTO(); 92 UserDTO dto = new UserDTO();
90 dto.setTenantId(tenantId); 93 dto.setTenantId(tenantId);
@@ -435,6 +435,11 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE @@ -435,6 +435,11 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
435 fillUserStatus(record); 435 fillUserStatus(record);
436 record.setHasPassword(StringUtils.isNotBlank(record.getActivateToken())); 436 record.setHasPassword(StringUtils.isNotBlank(record.getActivateToken()));
437 record.setPassword(null); 437 record.setPassword(null);
  438 + //人员id
  439 + List<String> organizationIdsByUserId =
  440 + userOrganizationMappingService.getOrganizationIdsByUserId(record.getId());
  441 + //取人员的第一个部门供前端使用
  442 + record.setOrganizationId(organizationIdsByUserId.get(0));
438 }); 443 });
439 } 444 }
440 return getPageData(userPage, UserDTO.class); 445 return getPageData(userPage, UserDTO.class);