Merge remote-tracking branch 'remotes/origin/master'

src/main/java/org/springblade/founder/asj/service/StAsjXxtqService.java

@@ -279,8 +279,10 @@ public class StAsjXxtqService {
 					//return R.error().message("案事件嫌疑人身份证号码为空，数据质量不合格，请联系部刑专运维，不予提取。");
 					continue;
 				}else {
+					if(StringUtils.isEmpty(entity.getZhfzxyrNl())){
 						String nl = DataFormatUtil.parseNlFromSfzh(sfzh);
 						entity.setZhfzxyrNl(nl);
+					}
 					if(!StringUtils.isEmpty(asjxgrybh)){
 						QueryWrapper wrapper = new QueryWrapper();
 						wrapper.eq("xxsc_pdbz","0");
@@ -319,12 +321,11 @@ public class StAsjXxtqService {
 				entity.setXxlyms("信息来源于案件提取");
 				String asjxgrybh = entity.getBhrAsjxgrybh();
 				String sfzh = entity.getBhrCyzjZjhm();
-				if(StringUtils.isEmpty(sfzh)){
-					//return R.error().message("案事件被害人身份证号码为空，数据质量不合格，请联系部刑专运维，不予提取。");
-					continue;
-				}else if(!StringUtils.isEmpty(asjxgrybh)){
+			 	if(!StringUtils.isEmpty(asjxgrybh)){
+					if(StringUtils.isEmpty(entity.getBhrNl())){
 						String nl = DataFormatUtil.parseNlFromSfzh(sfzh);
 						entity.setBhrNl(nl);
+					}
 					QueryWrapper wrapper = new QueryWrapper();
 					wrapper.eq("xxsc_pdbz","0");
 					wrapper.eq("asjbh",asjbh);

src/main/java/org/springblade/founder/la/entity/XwLa.java

@@ -832,8 +832,8 @@ public class XwLa extends BaseEntity {
     /**
      * 警综案件编号（新增存放警综原始编号）
      */
-    @ApiModelProperty(value = "警综案件编号（新增存放警综原始编号）")
-    private String jzajbh;
+//    @ApiModelProperty(value = "警综案件编号（新增存放警综原始编号）")
+//    private String jzajbh;
     /**
      * 简要案情CN#1#1#1##TEXTAREA#27#
      */