1、修改常用功能的一些问题

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

@@ -64,6 +64,9 @@
         WHERE
             tmcm.staff_id = #{staffId} ::uuid
           AND tmcm.app_code = #{appCode}
+        <if test="gradeCode != null and gradeCode != ''">
+            AND (tam.grade_codes is null or #{gradeCode} = any(tam.grade_codes))
+        </if>
     </select>
 
     <!-- 查询表t_mst_com_menu，（条件查询）个数 -->

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

@@ -67,6 +67,9 @@
             <if test="exceptMenu != null  ">
                 AND tmf.menu_uuid != ALL(#{exceptMenu,typeHandler=UuidListTypeHandler} )
             </if>
+            <if test="gradeCode != null and gradeCode != ''">
+                AND (tam.grade_codes is null or #{gradeCode} = any(tam.grade_codes))
+            </if>
         ORDER BY
             tmf.qty DESC
         <if test="queryLimit != null and queryLimit != 0 ">

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

@@ -65,12 +65,12 @@
             <if test="flgValid != null">
                 AND t.flg_valid = #{flgValid}
             </if>
-            <if test="cpId != null and  staffCode!='东科智云-体验'" >
+            <if test="cpId != null" >
                 AND t.cp_id = #{cpId}
             </if>
-            <if test="staffCode=='东科智云-体验'" >
-                AND t.cp_id = 2
-            </if>
+<!--            <if test="staffCode=='东科智云-体验'" >-->
+<!--                AND t.cp_id = 2-->
+<!--            </if>-->
             <if test="hrStatus != null">
                 AND t.hr_status = #{hrStatus}
             </if>

src/main/java/com/dk/mdm/model/pojo/mst/Org.java

@@ -100,6 +100,13 @@ public class Org extends PageInfo<Org> implements Serializable {
     @TableField(typeHandler = UuidListTypeHandler.class)
     private List<String> levelUpper;
 
+    /**
+     * 业务部门标识
+     */
+    @Excel(name = "业务部门标识")
+    @ApiModelProperty(value = "业务部门标识")
+    private Boolean flgBusiness;
+
 
     /**
      * 下层ID

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

@@ -53,6 +53,11 @@ public class ComMenuQuery extends PageInfo<ComMenuQuery> implements Serializable
     @ApiModelProperty(value = "企业Id")
     private Integer cpId;
 
+    /**
+     * 系统版本
+     */
+    private String gradeCode;
+
 
     /**
      * 员工Id

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

@@ -84,6 +84,11 @@ public class MenuFrequencyQuery extends PageInfo<MenuFrequencyQuery> implements
     @TableField(typeHandler = UuidListTypeHandler.class)
     private List<String> exceptMenu;
 
+    /**
+     * 系统版本
+     */
+    private String gradeCode;
+
 
     /**
      * 修改时间 (触发器自动处理)

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

@@ -77,6 +77,13 @@ public class OrgQuery extends PageInfo<com.dk.mdm.model.query.mst.OrgQuery> impl
     @ApiModelProperty(value = "父级ID")
     private String parentId;
 
+    /**
+     * 业务部门标识
+     */
+    @Excel(name = "业务部门标识")
+    @ApiModelProperty(value = "业务部门标识")
+    private Boolean flgBusiness;
+
 
     /**
      * 显示顺序

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

@@ -60,6 +60,7 @@ public class ComMenuService extends BaseService<ComMenu> {
             List<MenuFrequencyResponse>  MenuFrequencyList = menuFrequencyMapper.selectByCond(new MenuFrequencyQuery()
                     .setStaffId(comMenuQuery.getStaffId())
                     .setAppCode(comMenuQuery.getAppCode())
+                    .setGradeCode(comMenuQuery.getGradeCode())
                     .setQueryLimit(max - comMenuList.size())
                     .setExceptMenu(exceptmenu))   ;
             MenuFrequencyList.forEach(it->{

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

@@ -85,7 +85,7 @@ public class WarehouseService extends BaseService<Warehouse> {
         warehouse.setWhId(uniqueNoteCode.get("outId").toString());
         warehouse.setWhCode(uniqueNoteCode.get("outNote").toString());
         //新建如果是默认取消其他默认
-        if(warehouseVO.getFlgDefault()){
+        if(warehouseVO.getFlgDefault() != null ){
             //默认  把其他置为非默认
             warehouseMapper.updateFlgDefault(authUtils.getStaff().getCpId());
         }