员工的model 调整

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -357,13 +357,6 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      */
     Long getInventoryCountByPage(Map param);
 
-     /**
-     * @desc : 获取账户类别
-     * @author : 王英杰
-     * @date : 2024/3/1 9:21
-     */
-    List<Map<String, Object>> getDictionaryDataByPage(Map param);
-
     List<Map<String, Object>> getSaleChannel(Map param);
     List<Map<String, Object>> getStaff(Map param);
 

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -59,9 +59,48 @@
             dkic_b.f_get_user_menu(#{appCode}, #{userId } ::uuid,#{cpId},#{lang})
     </select>
 
-    <resultMap id="BaseResultMap" type="java.util.Map">
-        <result column="kindTags" property="kindTags" typeHandler="JsonTypeHandler"/>
-    </resultMap>
+    <!--查用户功能权限-->
+    <select id="getUserFunction" resultType="java.util.Map">
+        select appm.menu_uuid                                         AS "menuUuid"
+             , appm.menu_name                                         as name
+             , sys.f_get_name_i18n_lang(appm.menu_name_i18n, #{i18n}) as "menuName"
+             , rr.fun_uuid                                            AS "funUuid"
+             , appm.object_code                                       AS "objectCode"
+             , appm.menu_type                                         AS "menuType"
+        from sys.t_app_menu appm
+                 inner join core.t_user_fun rr
+                            on rr.fun_uuid = appm.fun_uuid
+        where appm.flg_valid
+          and appm.app_code = #{appCode}
+          and appm.menu_type IN (1, 2)
+          and rr.user_id = #{userId};
+    </select>
+
+    <!--查询用于隐藏列信息-->
+    <select id="getUserTableInfo" resultType="java.util.Map">
+        select tuts.code,
+               tuts.table_type AS "tableType",
+               tuts.table_ref  AS "tableRef",
+               tuts.columns
+        from pset.t_user_table_set tuts
+        where tuts.flg_valid
+          and tuts.user_id = #{userId};
+    </select>
+
+    <!--查导航菜单(自定义报表用)-->
+    <select id="getMenuNavigation" resultType="java.util.Map">
+        select appm.menu_uuid AS "menuUuid"
+        ,sys.f_get_name_i18n_lang(appm.menu_name_i18n,#{i18n}) as "menuName"
+        ,appm.parent_uuid AS "parentUuid"
+        from sys.t_app_menu appm
+        where appm.flg_valid
+        <if test="parentUuid">
+            and appm.parent_uuid = #{parentUuid} ::uuid
+        </if>
+        and appm.app_code = 'WEB-MAIN'
+        and appm.menu_type = 0
+    </select>
+
 
     <!-- 获取应用-->
     <select id="getApplication" resultType="java.util.Map">
@@ -86,7 +125,7 @@
     </select>
 
     <!-- 获取数据种类 -->
-    <select id="getDataKind" resultMap="BaseResultMap">
+    <select id="getDataKind" resultType="java.util.Map">
         select kind_code AS "kindCode",
         sys.f_get_name_i18n(kind_name_i18n,#{i18n}) as "kindName",
         sys.f_get_name_i18n(kind_desc,#{i18n}) as "gradeKindDesc",
@@ -161,39 +200,6 @@
         </if>
     </select>
 
-    <!-- 获取用户菜单-->
-    <select id="getMenuByUser" resultType="java.util.Map">
-        select menu_uuid      AS "menuUuid",
-        name           AS "name",
-        menu_name      AS "menuName",
-        parent_uuid    AS "parentUuid",
-        menu_type      AS "menuType",
-        flg_menu       AS "flgMenu",
-        flg_right      AS "flgRight",
-        object_code    AS "objectCode",
-        object_paths   AS "objectPaths",
-        object_icon    AS "icon",
-        parent_path    AS "parentPath",
-        menu_tags      AS "menuTags",
-        level_code     AS "levelCode",
-        flg_fast       AS "flgFast",
-        fast_image     AS "fastImage",
-        fast_path      AS "fastPath",
-        ex_menu_uuid   AS "exMenuUuid",
-        flg_same_route AS "flgSameRoute",
-        flg_choose_id  AS "flgChooseId",
-        #{appCode}     AS "appCode",
-        menu_uuid      AS "id",
-        parent_uuid    AS "parentId"
-        from
-        <if test="appCode=='WEB-TOUCH'">
-            core.f_get_user_menu_touch(#{appCode}, #{userId})
-        </if>
-        <if test="appCode!='WEB-TOUCH'">
-            core.f_get_user_menu(#{appCode}, #{userId})
-        </if>
-    </select>
-
     <!-- 获取角色 -->
     <select id="getRole" resultType="java.util.Map">
         select role_Id    AS "roleId",