1.证件类型改为通过数据字典读取。

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/CompanyMemberController.java

@@ -13,6 +13,8 @@ import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.utils.CheckIdCard;
 import com.jpsoft.picc.modules.common.utils.POIUtils;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
+import com.jpsoft.picc.modules.sys.entity.DataDictionary;
+import com.jpsoft.picc.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -46,6 +48,9 @@ public class CompanyMemberController {
     @Autowired
     private JobsService jobsService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
     @ApiOperation(value="读取企业人员列表")
     @RequestMapping(value = "list",method = RequestMethod.POST)
     public MessageResult<List<CompanyMember>> list(
@@ -370,6 +375,9 @@ public class CompanyMemberController {
             int affectCount = 0;
             int existCount = 0;
             List<String> existName = new ArrayList<>();
+
+            List<DataDictionary> ddList = dataDictionaryService.findByCatalogName("证件类型");
+
             for(Object[] array : list){
                 try {
                     String name = array[1].toString();
@@ -403,15 +411,17 @@ public class CompanyMemberController {
                         CheckIdCard cic = null;
 
                         if (cardType.contains("身份证")) {
-                            companyMember.setCardType("1");
                             cic = new CheckIdCard(cardNo);
-                        } else if (cardType.contains("港澳通行证")) {
-                            companyMember.setCardType("2");
-                        } else if (cardType.contains("护照")) {
-                            companyMember.setCardType("3");
                         }
 
-                        if (StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
+                        for(DataDictionary dd : ddList){
+                            if(dd.getValue().equals(cardType)) {
+                                companyMember.setCardType(ddList.get(0).getValue());
+                                break;
+                            }
+                        }
+
+                        companyMember.setCardNo(cardNo);
 
                         if (StringUtils.isNotEmpty(sex)) {
                             if (sex.contains("男")) {