系统收费商品分部

mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -339,8 +339,12 @@
             </if>
             <if test="noOrganSearch == null">
                 <if test="organId != null and organId != ''">
-                    AND INTE_ARRAY (#{organId},CONCAT(replacement_show_organ_id_,member_fee_show_organ_id_,
-                    course_fee_show_organ_id_,education_show_organ_id_,student_show_organ_id_))
+                    AND INTE_ARRAY (#{organId},CONCAT(
+                    CASE WHEN member_fee_show_organ_id_ IS NULL THEN '' ELSE member_fee_show_organ_id_ END,
+                    CASE WHEN course_fee_show_organ_id_ IS NULL THEN '' ELSE course_fee_show_organ_id_ END,
+                    CASE WHEN education_show_organ_id_ IS NULL THEN '' ELSE education_show_organ_id_ END,
+                    CASE WHEN student_show_organ_id_ IS NULL THEN '' ELSE student_show_organ_id_ END,
+                    CASE WHEN replacement_show_organ_id_ IS NULL THEN '' ELSE replacement_show_organ_id_ END))
                 </if>
             </if>
             <if test="search!=null and search!=''">
@@ -380,8 +384,12 @@
                 AND FIND_IN_SET(#{goodsQuery.replacementShowOrganId},g.replacement_show_organ_id_)
             </if>
             <if test="goodsQuery.organId != null">
-                AND FIND_IN_SET (#{goodsQuery.organId},CONCAT(replacement_show_organ_id_,member_fee_show_organ_id_,
-                course_fee_show_organ_id_,education_show_organ_id_,student_show_organ_id_))
+                AND FIND_IN_SET (#{goodsQuery.organId},CONCAT(
+                CASE WHEN member_fee_show_organ_id_ IS NULL THEN '' ELSE member_fee_show_organ_id_ END,
+                CASE WHEN course_fee_show_organ_id_ IS NULL THEN '' ELSE course_fee_show_organ_id_ END,
+                CASE WHEN education_show_organ_id_ IS NULL THEN '' ELSE education_show_organ_id_ END,
+                CASE WHEN student_show_organ_id_ IS NULL THEN '' ELSE student_show_organ_id_ END,
+                CASE WHEN replacement_show_organ_id_ IS NULL THEN '' ELSE replacement_show_organ_id_ END))
             </if>
         </where>
     </sql>