lixing 4 лет назад
Родитель
Сommit
cdaeb9fe9c

+ 7 - 3
fm-person/src/main/java/com/persagy/fm/person/model/dto/UpsertPersonDTO.java

@@ -3,9 +3,11 @@ package com.persagy.fm.person.model.dto;
 import com.persagy.fm.common.constant.RegexConstants;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import net.minidev.json.annotate.JsonIgnore;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.Email;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.util.Date;
@@ -60,11 +62,11 @@ public class UpsertPersonDTO {
     @ApiModelProperty(value = "备注")
     private String remark;
 
-    @NotNull(message = "部门不能为空")
+    @NotEmpty(message = "部门不能为空")
     @ApiModelProperty(value = "所属部门id", required = true)
     private List<String> depIds;
 
-    @NotNull(message = "项目权限不能为空")
+    @NotEmpty(message = "项目权限不能为空")
     @ApiModelProperty(value = "关联的项目id", required = true)
     private List<String> projectIds;
 
@@ -92,9 +94,11 @@ public class UpsertPersonDTO {
     @ApiModelProperty("登录权限(年.月.日)")
     private Date expireDate;
 
-    @ApiModelProperty(value = "账号来源", required = true)
+    @ApiModelProperty(value = "账号来源")
+    @JsonIgnore
     private String userFrom;
 
     @ApiModelProperty("账号id")
+    @JsonIgnore
     private String accountId;
 }

+ 1 - 1
fm-person/src/main/java/com/persagy/fm/person/model/vo/ResponsePersonItemVO.java

@@ -106,7 +106,7 @@ public class ResponsePersonItemVO {
     private String username;
 
     @ApiModelProperty("登录权限(年.月.日/永久)")
-    private String expireDate;
+    private Date expireDate;
 
     @ApiModelProperty("账号来源")
     private String userFrom;

+ 7 - 1
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonServiceImpl.java

@@ -865,8 +865,14 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
         // 设置人员的基本信息
         ResponsePersonItemVO responsePersonItemVO = ConvertPersonTool.INSTANCE.convert2ResponseItemDTO(person);
 
-        // 设置人员岗位角色信息
+        // 设置人员账号信息
         String accountId = person.getAccountId();
+        SaasAccountListItemVO saasAccountListItemVO = saasAccountService.querySaasAccountDetail(accountId);
+        responsePersonItemVO.setMail(saasAccountListItemVO.getMail());
+        responsePersonItemVO.setPhoneNum(saasAccountListItemVO.getPhoneNum());
+        responsePersonItemVO.setExpireDate(saasAccountListItemVO.getValidEndTime());
+
+        // 设置人员岗位角色信息
         Map<String, AccountRoleVO> accountRoleVoMap = saasAccountRoleService.
                 queryAccountRoleVoMapByAccountIdList(Lists.newArrayList(accountId));
         if (accountRoleVoMap != null) {

+ 1 - 1
fm-person/src/main/java/com/persagy/fm/saas/accountrole/service/impl/SaasAccountRoleServiceImpl.java

@@ -50,7 +50,7 @@ public class SaasAccountRoleServiceImpl implements ISaasAccountRoleService {
      */
     @Override
     public String createSaasAccountRole(AddSaasAccountRoleDTO addSaasAccountRoleDTO) {
-        addSaasAccountRoleDTO.setDefaultValue();
+        addSaasAccountRoleDTO.setDefaultValueNoAccountId();
         FmResponseContent<String> saasAccountRole = saasAccountRoleClient.createSaasAccountRole(addSaasAccountRoleDTO);
         return saasAccountRole.getContent();
     }