Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

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

@@ -129,14 +129,19 @@
             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 AND roleFun.app_code = #{appCode}
-
+            LEFT JOIN dkic_b.t_mst_role_fun roleFun ON menu.fun_uuid = roleFun.fun_uuid   and roleFun.role_id = #{roleId}::uuid
+        <if test="appCode != null">
+            AND roleFun.app_code = #{appCode}
+        </if>
         </if>
 
 
         WHERE menu.flg_valid
           AND menu.flg_right
           AND menu.object_code != 'home'
+        <if test="appCode != null">
+            AND menu.app_code = #{appCode}
+        </if>
         <if test="searchText != null">
             AND (position(#{searchText} in menu.menu_name ) > 0 )
         </if>