1.使用登记、安装告知属地监管部门列表过滤问题

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

@@ -75,11 +75,11 @@
                 </if>
                 <if test="param.orgBranchCode != null and param.orgBranchCode != ''">
                     <choose>
-                        <when test="client == 'jgAudit'">
-                            AND isn.org_branch_code= #{param.orgBranchCode}
+                        <when test="client == 'jgLook'">
+                            AND isn.org_branch_code LIKE concat(#{param.orgBranchCode},'%')
                         </when>
                         <otherwise>
-                            AND isn.org_branch_code LIKE concat(#{param.orgBranchCode},'%')
+                            AND isn.org_branch_code= #{param.orgBranchCode}
                         </otherwise>
                     </choose>
                 </if>

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

@@ -267,13 +267,11 @@
             </if>
             <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
                 <choose>
-                    <when test="client == 'jgAudit'">
-                        and supervisionOrgCode = #{dto.orgBranchCode}
-
+                    <when test="client == 'jgLook'">
+                        and supervisionOrgCode like concat(#{dto.orgBranchCode},'%')
                     </when>
                     <otherwise>
-                        and supervisionOrgCode like concat(#{dto.orgBranchCode},'%')
-
+                        and supervisionOrgCode = #{dto.orgBranchCode}
                     </otherwise>
                 </choose>
             </if>
@@ -348,6 +346,16 @@
             <if test="dto.auditPassDateStart != null and dto.auditPassDateEnd != null">
                 AND auditPassDate BETWEEN #{dto.auditPassDateStart} AND #{dto.auditPassDateEnd}
             </if>
+            <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
+                <choose>
+                    <when test="client == 'jgLook'">
+                        and supervisionOrgCode like concat(#{dto.orgBranchCode},'%')
+                    </when>
+                    <otherwise>
+                        and supervisionOrgCode = #{dto.orgBranchCode}
+                    </otherwise>
+                </choose>
+            </if>
             <if test="dto.dataType == 'supervision' ">
                 <choose>
                     <when test="client == 'jgAudit'">