启用停用bug修改

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

@@ -33,9 +33,6 @@
             <if test="dto.applyNo != null and dto.applyNo != '' ">
               and  jed.apply_no like concat('%',#{dto.applyNo},'%')
             </if>
-            <if test="dto.applyNo != null and dto.applyNo != '' ">
-              and  jed.apply_no = #{dto.receiveOrgCode}
-            </if>
             <if test="dto.auditStatus != null and dto.auditStatus != '' ">
                 and  jed.audit_status = #{dto.auditStatus}
             </if>
@@ -45,6 +42,13 @@
             <if test="dto.type == 'supervision'">
                 and  jed.receive_org_code = #{dto.useUnitCreditCode}
             </if>
+            <if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
+                and  jed.receive_org_code = #{dto.receiveOrgCode}
+            </if>
+            <if test="dto.applyType != null and dto.applyType != ''">
+                and  jed.apply_type = #{dto.applyType}
+            </if>
+
             <if test="dto.roleIds != null and dto.type == 'supervision'">
                 <foreach collection='dto.roleIds' item='role' open='and (' close=')' separator='or'>
                     execute_sequence like concat('%',#{role},'%')