用户和企业添加字段

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/CompanyInfo.java

@@ -63,8 +63,8 @@ public class CompanyInfo {
     private Date updateTime;
     @ApiModelProperty(value = "是否删除")
     private Boolean delFlag;
-    @ApiModelProperty(value = "企联职务（数据字典:气帘职务）")
+    @ApiModelProperty(value = "企联职务（数据字典:企联职务）")
     private String position;
-    @ApiModelProperty(value = "企联职务（数据字典:气帘职务）翻译")
+    @ApiModelProperty(value = "企联职务（数据字典:企联职务）翻译")
     private String positionName;
 }

web/src/main/java/com/jpsoft/enterprise/modules/base/controller/CompanyInfoController.java

@@ -268,6 +268,8 @@ public class CompanyInfoController {
             ci.setTypeN(dataDictionaryService.findNameByCatalogNameAndValue("企业类型",ci.getType()));
             ci.setScaleN(dataDictionaryService.findNameByCatalogNameAndValue("企业规模",ci.getScale()));
             ci.setRegionN(dataDictionaryService.findNameByCatalogNameAndValue("区域",ci.getRegion()));
+            ci.setPositionName(dataDictionaryService.findNameByCatalogNameAndValue("企联职务",ci.getPosition()));
+
         }
 
         msgResult.setResult(true);

web/src/main/java/com/jpsoft/enterprise/modules/base/controller/PersonInfoController.java

@@ -275,6 +275,7 @@ public class PersonInfoController {
         Page<PersonInfo> page = personInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(PersonInfo pi : page.getResult()){
             pi.setRegisterTypeName(dataDictionaryService.findNameByCatalogNameAndValue("注册用户类型",pi.getRegisterType()));
+            pi.setTitleName(dataDictionaryService.findNameByCatalogNameAndValue("用户头衔",pi.getTitle()));
         }
 
         msgResult.setResult(true);