Merge remote-tracking branch 'origin/develop_tzs_main' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -1132,7 +1132,7 @@ public class JGDPStatisticsServiceImpl {
             return this.setDefaultEquStateCount();
         }
         // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", QueryParser.escape(orgCode)));
+        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         //已赋码
         boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
         boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", "null"));

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan.xml

@@ -160,7 +160,7 @@
 	</select>
 
 	<select id="queryPlanListByOrgCode" resultType="Map">
-		select p.id, p.name from p_plan p where p.is_delete = 0 and and b.biz_org_code like concat(#{loginOrgCode},'%')
+		select p.id, p.name from p_plan p where p.is_delete = 0 and p.biz_org_code like concat(#{loginOrgCode},'%')
 	</select>
 
 	<update id="initUpdatePlanStatus">