Просмотр исходного кода

优化 批量导入时 不校验手机号和身份证

java110 лет назад: 4
Родитель
Сommit
fa6a186619

+ 17 - 15
service-api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java

@@ -103,21 +103,23 @@ public class SaveOwnerListener extends AbstractServiceApiPlusListener {
 
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        //获取手机号(判断手机号是否重复)
-        String link = reqJson.getString("link");
-        OwnerDto ownerDto = new OwnerDto();
-        ownerDto.setLink(link);
-        ownerDto.setCommunityId(reqJson.getString("communityId"));
-        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryAllOwners(ownerDto);
-        Assert.listIsNull(ownerDtos, "手机号重复,请重新输入");
-        //获取身份证号(判断身份证号是否重复)
-        String idCard = reqJson.getString("idCard");
-        if (!StringUtil.isEmpty(idCard) ) {
-            OwnerDto owner = new OwnerDto();
-            owner.setIdCard(idCard);
-            owner.setCommunityId(reqJson.getString("communityId"));
-            List<OwnerDto> owners = ownerInnerServiceSMOImpl.queryAllOwners(owner);
-            Assert.listIsNull(owners, "身份证号重复,请重新输入");
+        if (!reqJson.containsKey("source") || !"BatchImport".equals(reqJson.getString("source"))) {
+            //获取手机号(判断手机号是否重复)
+            String link = reqJson.getString("link");
+            OwnerDto ownerDto = new OwnerDto();
+            ownerDto.setLink(link);
+            ownerDto.setCommunityId(reqJson.getString("communityId"));
+            List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryAllOwners(ownerDto);
+            Assert.listIsNull(ownerDtos, "手机号重复,请重新输入");
+            //获取身份证号(判断身份证号是否重复)
+            String idCard = reqJson.getString("idCard");
+            if (!StringUtil.isEmpty(idCard)) {
+                OwnerDto owner = new OwnerDto();
+                owner.setIdCard(idCard);
+                owner.setCommunityId(reqJson.getString("communityId"));
+                List<OwnerDto> owners = ownerInnerServiceSMOImpl.queryAllOwners(owner);
+                Assert.listIsNull(owners, "身份证号重复,请重新输入");
+            }
         }
         //生成memberId
         generateMemberId(reqJson);

+ 1 - 0
service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -493,6 +493,7 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
             paramIn.put("sex", owner.getSex());
             paramIn.put("ownerTypeCd", "1001");
             paramIn.put("idCard", owner.getIdCard());
+            paramIn.put("source","BatchImport");
             responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
 
             if (responseEntity.getStatusCode() == HttpStatus.OK) {