增加查询条件

src/main/java/com/dk/mdm/mapper/mst/DictionaryDataMapper.xml

@@ -97,7 +97,10 @@
             <if test="flgDefault != null">
                 AND flg_default = #{flgDefault}
             </if>
-
+            <if test="flgValidList != null and flgValidList.size()>0">
+                AND flg_valid =
+                any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
             <if  test="searchText != null">
                 AND (data_value  like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  dict_code  like concat('%', my_ex.likequery(#{searchText}) , '%')

src/main/java/com/dk/mdm/mapper/mst/RoleMapper.xml

@@ -126,11 +126,10 @@
     <!-- 查询表t_mst_role，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        '预制'  AS "displayStatus"
+        <include refid="Base_Column_List"/>
         FROM dkic_b.t_mst_role
         <include refid="Condition"/>
-        ORDER BY display_no desc
+        ORDER BY op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

src/main/java/com/dk/mdm/mapper/mst/SaleChannelMapper.xml

@@ -84,7 +84,10 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
-
+            <if test="flgValidList != null and flgValidList.size()>0">
+                AND flg_valid =
+                any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
 
             <if  test="searchText != null">
                 AND (channel_name  like concat('%', my_ex.likequery(#{searchText}) , '%')

src/main/java/com/dk/mdm/mapper/mst/WarehouseMapper.xml

@@ -95,7 +95,10 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
-
+            <if test="flgValidList != null and flgValidList.size()>0">
+                AND flg_valid =
+                any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
             <if  test="searchText != null">
                 AND (wh_name  like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  wh_code  like concat('%', my_ex.likequery(#{searchText}) , '%')

src/main/java/com/dk/mdm/model/query/mst/DictionaryDataQuery.java

@@ -20,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  数据字典
@@ -187,7 +188,7 @@ public class DictionaryDataQuery extends PageInfo<DictionaryDataQuery> implement
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
-
+    private List<Boolean> flgValidList;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/query/mst/SaleChannelQuery.java

@@ -20,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  销售渠道
@@ -177,7 +178,7 @@ public class SaleChannelQuery extends PageInfo<SaleChannelQuery> implements Seri
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
-
+    private List<Boolean> flgValidList;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/query/mst/WarehouseQuery.java

@@ -20,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  仓库档案
@@ -193,6 +194,7 @@ public class WarehouseQuery extends PageInfo<WarehouseQuery> implements Serializ
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
+    private List<Boolean> flgValidList;
 
 
     private static final long serialVersionUID = 1L;