1

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

@@ -72,7 +72,8 @@ public class PersonInfoController {
         try {
             Map<String, Object> searchParams = new HashMap<>();
             searchParams.put("companyId", personInfo.getCompanyId());
-            searchParams.put("idCard", personInfo.getIdCard());
+            searchParams.put("name", personInfo.getName());
+            searchParams.put("phone", personInfo.getPhone());
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_","asc"));
             Page<PersonInfo> page = personInfoService.pageSearch(searchParams, 1, 1,false, sortList);
@@ -84,18 +85,18 @@ public class PersonInfoController {
             } else {
                 CheckIdCard cic = null;
                 if (StringUtils.isEmpty(personInfo.getIdCard())) {
-                    msgResult.setMessage("身份证不能为空!");
-                    msgResult.setResult(false);
-                    return msgResult;
+//                    msgResult.setMessage("身份证不能为空!");
+//                    msgResult.setResult(false);
+//                    return msgResult;
                 } else {
                     personInfo.setIdCard(personInfo.getIdCard().trim().toUpperCase());
-                }
 
-                cic = new CheckIdCard(personInfo.getIdCard());
-                if (!cic.validate()) {
-                    msgResult.setMessage("身份证验证失败!");
-                    msgResult.setResult(false);
-                    return msgResult;
+                    cic = new CheckIdCard(personInfo.getIdCard());
+                    if (!cic.validate()) {
+                        msgResult.setMessage("身份证验证失败!");
+                        msgResult.setResult(false);
+                        return msgResult;
+                    }
                 }
             }