户籍，登记单位截取

src/main/java/com/founder/service/impl/ZtryServiceImpl.java

@@ -162,6 +162,17 @@ public class ZtryServiceImpl implements ZtryService {
         if (StringUtils.isNotEmpty(ztry.getXxdjdwGajgjgdm())) {
             String unitcode = ztry.getXxdjdwGajgjgdm();
             if(!"222".equals(unitcode)&&!"111".equals(unitcode)&&!"999".equals(unitcode)){
+                if (unitcode.endsWith("0000000000")) {
+                    unitcode = unitcode.substring(0, 2);
+                }
+                // 市局
+                else if (unitcode.endsWith("00000000")) {
+                    unitcode = unitcode.substring(0, 4);
+                }
+                // 分局
+                else if (unitcode.endsWith("000000")) {
+                    unitcode = unitcode.substring(0, 6);
+                }
                 WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", unitcode + "*");
                 bqXyr.must(wildcardQueryBuilder);
             }else if("222".equals(unitcode)){
@@ -184,6 +195,17 @@ public class ZtryServiceImpl implements ZtryService {
         if (StringUtils.isNotEmpty(ztry.getTjxxdjdwGajgjgdm())) {
             String unitcode = ztry.getTjxxdjdwGajgjgdm();
             if(!"222".equals(unitcode)&&!"111".equals(unitcode)&&!"999".equals(unitcode)){
+                if (unitcode.endsWith("0000000000")) {
+                    unitcode = unitcode.substring(0, 2);
+                }
+                // 市局
+                else if (unitcode.endsWith("00000000")) {
+                    unitcode = unitcode.substring(0, 4);
+                }
+                // 分局
+                else if (unitcode.endsWith("000000")) {
+                    unitcode = unitcode.substring(0, 6);
+                }
                 WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", unitcode + "*");
                 bqXyr.must(wildcardQueryBuilder);
             }else if("222".equals(unitcode)){
@@ -206,6 +228,11 @@ public class ZtryServiceImpl implements ZtryService {
         if (StringUtils.isNotEmpty(ztry.getHjdzXzqhdm())) {
             String zhfzxyrHjdzXzqhdm = ztry.getHjdzXzqhdm();
             if(!"222".equals(zhfzxyrHjdzXzqhdm)&&!"111".equals(zhfzxyrHjdzXzqhdm)&&!"999".equals(zhfzxyrHjdzXzqhdm)){
+                if (zhfzxyrHjdzXzqhdm.endsWith("0000")) {
+                    zhfzxyrHjdzXzqhdm = zhfzxyrHjdzXzqhdm.substring(0, 2);
+                } else if (zhfzxyrHjdzXzqhdm.endsWith("00")) {
+                    zhfzxyrHjdzXzqhdm = zhfzxyrHjdzXzqhdm.substring(0, 4);
+                }
                 WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("hjdzXzqhdm", zhfzxyrHjdzXzqhdm + "*");
                 bqXyr.must(wildcardQueryBuilder);
             }else if("222".equals(zhfzxyrHjdzXzqhdm)){
@@ -228,6 +255,11 @@ public class ZtryServiceImpl implements ZtryService {
         if (StringUtils.isNotEmpty(ztry.getTjhjdzXzqhdm())) {
             String zhfzxyrHjdzXzqhdm = ztry.getTjhjdzXzqhdm();
             if(!"222".equals(zhfzxyrHjdzXzqhdm)&&!"111".equals(zhfzxyrHjdzXzqhdm)&&!"999".equals(zhfzxyrHjdzXzqhdm)){
+                if (zhfzxyrHjdzXzqhdm.endsWith("0000")) {
+                    zhfzxyrHjdzXzqhdm = zhfzxyrHjdzXzqhdm.substring(0, 2);
+                } else if (zhfzxyrHjdzXzqhdm.endsWith("00")) {
+                    zhfzxyrHjdzXzqhdm = zhfzxyrHjdzXzqhdm.substring(0, 4);
+                }
                 WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("hjdzXzqhdm", zhfzxyrHjdzXzqhdm + "*");
                 bqXyr.must(wildcardQueryBuilder);
             }else if("222".equals(zhfzxyrHjdzXzqhdm)){