属地监管部门增加 筛选限制 企业eq 监管部门查看like 修改代码错误

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml

@@ -48,7 +48,7 @@
                         and tjvi.org_branch_code = #{dto.orgBranchCode}
                     </when>
                     <otherwise>
-                        AND supervision_org_code LIKE CONCAT(#{dto.supervisionOrgCode}, '%')
+                        AND tjvi.org_branch_codeLIKE CONCAT(#{dto.orgBranchCode}, '%')
                     </otherwise>
                 </choose>
             </if>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -2588,7 +2588,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         // 增加监管端查询, 查询规则看到本级及之下的设备
         if(!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))){
-            boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(map.getString("ORG_BRANCH_CODE")) + "*"));
+            boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE.keyword", map.getString("ORG_BRANCH_CODE")));
         }
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);