修改

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -2,6 +2,7 @@ package cn.quantgroup.xyqb.controller.external.user;
 
 import cn.quantgroup.motan.bean.UserAssociationBean;
 import cn.quantgroup.motan.retbean.XContact;
+import cn.quantgroup.motan.retbean.XContactInfo;
 import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Address;
@@ -229,12 +230,12 @@ public class InnerController implements IBaseController {
         bean.setProvince(address.getProvince());
       }
       if (null != extInfo) {
-        bean.setEducationEnum(extInfo.getEducationEnum());
-        bean.setOccupationEnum(extInfo.getOccupationEnum());
-        bean.setMarryStatus(extInfo.getMarryStatus());
+        bean.setEducationEnum(extInfo.getEducationEnum().getName());
+        bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
+        bean.setMarryStatus(extInfo.getMarryStatus().getDescription());
       }
       if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contacts)) {
-        List<XContact> userContacts = contacts2ContactRets(contacts);
+        List<XContactInfo> userContacts = contacts2ContactRets(contacts);
         bean.setContractResults(userContacts);
       }
     }
@@ -267,12 +268,12 @@ public class InnerController implements IBaseController {
         bean.setProvince(address.getProvince());
       }
       if (null != extInfo) {
-        bean.setEducationEnum(extInfo.getEducationEnum());
-        bean.setOccupationEnum(extInfo.getOccupationEnum());
-        bean.setMarryStatus(extInfo.getMarryStatus());
+        bean.setEducationEnum(extInfo.getEducationEnum().getName());
+        bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
+        bean.setMarryStatus(extInfo.getMarryStatus().getDescription());
       }
       if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contacts)) {
-        List<XContact> userContacts = contacts2ContactRets(contacts);
+        List<XContactInfo> userContacts = contacts2ContactRets(contacts);
         bean.setContractResults(userContacts);
       }
     }
@@ -796,24 +797,24 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, new UserRet(user));
   }
 
-  public static XContact contact2ContactRet(Contact c) {
+  public static XContactInfo contact2ContactRet(Contact c) {
     if (c == null) {
       return null;
     }
-    XContact ret = new XContact();
+    XContactInfo ret = new XContactInfo();
     ret.setId(c.getId());
     ret.setUserId(c.getUserId());
     ret.setName(c.getName());
     ret.setPhoneNo(c.getPhoneNo());
-    ret.setRelation(c.getRelation());
+    ret.setRelation(c.getRelation().getDescription());
     return ret;
   }
 
-  public static List<XContact> contacts2ContactRets(List<Contact> cs) {
+  public static List<XContactInfo> contacts2ContactRets(List<Contact> cs) {
     if (org.apache.commons.collections.CollectionUtils.isEmpty(cs)) {
       return Collections.emptyList();
     }
-    List<XContact> contactRets = new ArrayList<>();
+    List<XContactInfo> contactRets = new ArrayList<>();
     for (Contact c : cs) {
       contactRets.add(contact2ContactRet(c));
     }