bug修改

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

@@ -43,7 +43,8 @@
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
         <result column="goodsBrand" property="goodsBrand"/>
-        <result column="supplierName" property="supplierName"/>
+        <result column="supplierNames" property="supplierNames"/>
+        <result column="supplierIds" property="supplierIds"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -73,7 +74,9 @@
             <if test="opCreateTime != null">
                 AND tmgb.op_create_time = #{opCreateTime}
             </if>
-
+            <if test="searchText != null">
+                AND (position(#{searchText} in tmgb.brand_code) > 0   OR position(#{searchText} in tmgb.brand_name) > 0   OR  position(#{searchText} in tmgb.remarks) > 0 )
+            </if>
         </where>
     </sql>
 
@@ -93,7 +96,11 @@
         (SELECT  COALESCE(array_to_string(array_agg(tsm.sup_name), ','),'')
         FROM dkic_b.t_mst_supplier_brand tsmb
         left join dkic_b.t_mst_supplier tsm on tsm.sup_id = tsmb.sup_id
-        WHERE tsmb.brand_id  =  tmgb.brand_id) AS "supplierName"
+        WHERE tsmb.brand_id  =  tmgb.brand_id) AS "supplierNames",
+        (SELECT  COALESCE(array_to_string(array_agg(tsm.sup_id), ','),'')
+        FROM dkic_b.t_mst_supplier_brand tsmb
+        left join dkic_b.t_mst_supplier tsm on tsm.sup_id = tsmb.sup_id
+        WHERE tsmb.brand_id  =  tmgb.brand_id) AS "supplierIds"
         FROM dkic_b.t_mst_goods_brand tmgb
         <include refid="Condition"/>
         order by display_no asc

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

@@ -120,6 +120,9 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
+            <if test="searchText != null">
+                AND (position(#{searchText} in cat_code) > 0   OR position(#{searchText} in cat_name) > 0   OR  position(#{searchText} in remarks) > 0 )
+            </if>
         </where>
     </sql>
 

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

@@ -69,6 +69,9 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
+            <if test="searchText != null">
+                AND (position(#{searchText} in series_code) > 0   OR position(#{searchText} in series_name) > 0   OR  position(#{searchText} in remarks) > 0 )
+            </if>
         </where>
     </sql>
 

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

@@ -115,14 +115,30 @@
                menu.app_code     AS "appCode",
                menu.parent_uuid  AS "parentId",
                menu.flg_menu     AS "flgMenu",
-               roleFun.role_id   AS "roleId",
-               menu.fun_uuid     AS "funUuid",
-               CASE WHEN roleFun.role_id IS NULL THEN FALSE ELSE TRUE END    AS "checked"
+
+        <if test="menuUuids!=null and menuUuids.size()> 0">
+            CASE WHEN menus.menu_uuid IS NULL THEN FALSE ELSE TRUE END    AS "checked",
+        </if>
+        <if test="roleId != null">
+            roleFun.role_id   AS "roleId",
+            CASE WHEN roleFun.role_id IS NULL THEN FALSE ELSE TRUE END    AS "checked",
+        </if>
+        menu.fun_uuid     AS "funUuid"
         FROM sys.t_app_menu menu
-                 LEFT JOIN dkic_b.t_mst_role_fun roleFun ON menu.fun_uuid = roleFun.fun_uuid  and roleFun.role_id = #{roleId}::uuid
+        <if test="menuUuids!=null and menuUuids.size()> 0">
+            left JOIN sys.t_app_menu menus ON menu.menu_uuid =  menus.menu_uuid and  menus.menu_uuid = ANY(#{menuUuids, typeHandler=UuidListTypeHandler})
+        </if>
+        <if test="roleId != null">
+            LEFT JOIN dkic_b.t_mst_role_fun roleFun ON menu.fun_uuid = roleFun.fun_uuid  and roleFun.role_id = #{roleId}::uuid
+        </if>
+
+
         WHERE menu.flg_valid
           AND menu.flg_right
           AND menu.object_code != 'home'
+        <if test="searchText != null">
+            AND (position(#{searchText} in menu.menu_name ) > 0 )
+        </if>
         ORDER BY menu.level_code;
     </select>
 

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

@@ -102,6 +102,10 @@
             <if test="flgNolimitSen != null">
                 AND flg_nolimit_sen = #{flgNolimitSen}
             </if>
+            <if test="searchText != null">
+                AND (position(#{searchText} in role_name) > 0   OR position(#{searchText} in role_code) > 0   OR  position(#{searchText} in remarks) > 0 )
+            </if>
+
         </where>
     </sql>
 

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

@@ -109,7 +109,9 @@
                  LEFT JOIN dkic_b.t_mst_role_sensitive tmrs
                            ON tsi.item_code = tmrs.sen_item_code and tmrs.role_id = #{roleId}::uuid
         WHERE tsi.flg_valid
-
+        <if test="searchText != null">
+            AND (position(#{searchText} in tsi.item_name_i18n ->> 'zh_CN') > 0   OR position(#{searchText} in tsi.item_code) > 0 )
+        </if>
         ORDER BY tsi.level_code;
     </select>
 

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

@@ -72,6 +72,9 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
+            <if test="searchText != null">
+                AND (position(#{searchText} in unit_code) > 0   OR position(#{searchText} in unit_name) > 0   OR  position(#{searchText} in remarks) > 0 )
+            </if>
         </where>
     </sql>
 

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

@@ -112,6 +112,8 @@ public class GoodsBrandQuery extends PageInfo<GoodsBrandQuery> implements Serial
     @TableField(typeHandler = TimestampTypeHandler.class)
     private LocalDateTime opCreateTime;
 
+    private String searchText;
+
 
 
 

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

@@ -237,7 +237,7 @@ public class GoodsCategoryQuery extends PageInfo<GoodsCategoryQuery> implements
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
-
+    private String searchText;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -168,7 +168,7 @@ public class GoodsSeriesQuery extends PageInfo<GoodsSeriesQuery> implements Seri
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
-
+    private String searchText;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -173,6 +173,9 @@ public class RoleQuery extends PageInfo<Role> implements Serializable {
     @ApiModelProperty(value = "")
     private Boolean flgNolimitSen;
 
+    private String searchText;
+
+
 
     /*
      * 相关属性

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

@@ -176,7 +176,7 @@ public class UnitQuery extends PageInfo<UnitQuery> implements Serializable {
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
-
+    private String searchText;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/response/mst/GoodsBrandResponse.java

@@ -169,7 +169,9 @@ public class GoodsBrandResponse extends PageInfo<GoodsBrandResponse> implements
 
     private String goodsBrand;
 
-    private String supplierName;
+    private String supplierNames;
+
+    private String supplierIds;
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/service/mst/RoleService.java

@@ -78,7 +78,12 @@ public class RoleService extends BaseService<Role> {
     public ResponseResultVO<?> saveRole(RoleVo roleVO) {
         Role role = roleConvert.convertToPo(roleVO);
         Integer displayNo = roleMapper.selectDisplayNo(new RoleQuery());
-        role.setDisplayNo(displayNo);
+        if (displayNo != null) {
+            //插入序号
+            role.setDisplayNo(displayNo);
+        } else {
+            role.setDisplayNo(0);
+        }
         //设置编码
         Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.ROLE.getName(), true);
         role.setRoleId(uniqueNoteCode.get("outId").toString());