系统收费商品不根据分部查询

mec-biz/src/main/java/com/ym/mec/biz/dal/page/GoodsQueryInfo.java

@@ -46,8 +46,19 @@ public class GoodsQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "分部")
     private String organId;
 
+    @ApiModelProperty(value = "此参数为1则不按分部查询")
+    private Integer noOrganSearch;
+
     private Integer subjectId;
 
+    public Integer getNoOrganSearch() {
+        return noOrganSearch;
+    }
+
+    public void setNoOrganSearch(Integer noOrganSearch) {
+        this.noOrganSearch = noOrganSearch;
+    }
+
     public String getOrganId() {
         return organId;
     }
@@ -143,4 +154,12 @@ public class GoodsQueryInfo extends QueryInfo {
     public void setStatus(YesOrNoEnum status) {
         this.status = status;
     }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
 }

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

@@ -347,9 +347,11 @@
             <if test="replacementShowOrganId!=null">
                 AND FIND_IN_SET(#{replacementShowOrganId},g.replacement_show_organ_id_)
             </if>
-            <if test="organId != null and organId != ''">
-                AND INTE_ARRAY (#{organId},CONCAT_WS(",",replacement_show_organ_id_,member_fee_show_organ_id_,
-                course_fee_show_organ_id_,education_show_organ_id_,student_show_organ_id_))
+            <if test="noOrganSearch == null">
+                <if test="organId != null and organId != ''">
+                    AND INTE_ARRAY (#{organId},CONCAT_WS(",",replacement_show_organ_id_,member_fee_show_organ_id_,
+                    course_fee_show_organ_id_,education_show_organ_id_,student_show_organ_id_))
+                </if>
             </if>
             <if test="search!=null and search!=''">
                 AND (g.sn_=#{search} OR g.id_=#{search} OR g.name_ LIKE CONCAT('%', #{search}, '%'))