Selaa lähdekoodia

对返回的空值进行处理

lixing 4 vuotta sitten
vanhempi
commit
32b4ad3ac6

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

@@ -13,6 +13,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import org.assertj.core.util.Lists;
 
 /**
  * @author lixing
@@ -128,7 +129,39 @@ public class ResponsePersonItemVO {
     @ApiModelProperty("启用状态")
     private String enableState;
 
+    public SimpleObjVO getPersonTypeVO() {
+        return personTypeVO == null ? new SimpleObjVO() : personTypeVO;
+    }
+
+    public SimpleObjVO getCertificateTypeVO() {
+        return certificateTypeVO == null ? new SimpleObjVO() : certificateTypeVO;
+    }
+
+    public List<DepSimpleObjVO> getDeps() {
+        return deps == null ? Lists.newArrayList() : deps;
+    }
+
+    public List<SimpleObjVO> getProjects() {
+        return projects == null ? Lists.newArrayList() : projects;
+    }
+
     public SimpleObjVO getMainDuty() {
-        return mainDuty == null ? new SimpleObjVO("", "") : mainDuty;
+        return mainDuty == null ? new SimpleObjVO() : mainDuty;
+    }
+
+    public List<SimpleObjVO> getOtherDuties() {
+        return otherDuties == null ? Lists.newArrayList() : otherDuties;
+    }
+
+    public SimpleObjVO getLeaderVO() {
+        return leaderVO == null ? new SimpleObjVO() : leaderVO;
+    }
+
+    public List<SimpleObjVO> getProfessions() {
+        return professions == null ? Lists.newArrayList() : professions;
+    }
+
+    public List<SimpleObjVO> getOtherRoles() {
+        return otherRoles == null ? Lists.newArrayList() : otherRoles;
     }
 }

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

@@ -5,9 +5,11 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.persagy.fm.common.model.vo.SimpleObjVO;
+import com.persagy.fm.department.model.vo.DepSimpleObjVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.assertj.core.util.Lists;
 
 import java.util.List;
 
@@ -56,7 +58,19 @@ public class ResponsePersonListItemVO {
     @ApiModelProperty("登录权限(年.月.日/永久)")
     private String expireDate;
 
+    public SimpleObjVO getPersonTypeVO() {
+        return personTypeVO == null ? new SimpleObjVO() : personTypeVO;
+    }
+
     public SimpleObjVO getMainDuty() {
-        return mainDuty == null ? new SimpleObjVO("", "") : mainDuty;
+        return mainDuty == null ? new SimpleObjVO() : mainDuty;
+    }
+
+    public List<SimpleObjVO> getOtherDuties() {
+        return otherDuties == null ? Lists.newArrayList() : otherDuties;
+    }
+
+    public List<SimpleObjVO> getProfessions() {
+        return professions == null ? Lists.newArrayList() : professions;
     }
 }