更新用户分配菜单树的点击bug及医院管理员进归档系统慢

power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java

@@ -80,9 +80,9 @@ public class PowerWebServiceImpl implements PowerWebService {
         // 当前用户的所有菜单集合
         List<Power_Menu> tempPowerMenus = new ArrayList<>(powerRoleMenus);
         for (Power_Menu powerMenu:powerUserMenus) {
-            if(powerMenu.getFlag() == Constant.EFFECTIVE_YES){
+            if(powerMenu.getFlag().equals(Constant.EFFECTIVE_YES)){
                 tempPowerMenus.add(powerMenu);
-            }else if(powerMenu.getFlag() == Constant.EFFECTIVE_NO){
+            }else if(powerMenu.getFlag().equals(Constant.EFFECTIVE_NO)){
                 tempPowerMenus.remove(powerMenu);
             }
         }

power-admin/src/main/webapp/static/js/menu/userPowerList.js

@@ -82,7 +82,7 @@ function addChildNodes(event, treeId, treeNode){
                                 name: data[i].name,
                                 newName: data[i].newName,
                                 sysFlag: sysFlag,
-								selfId: data[i].name.split('-')[0]
+                                selfId: data[i].selfId
                             }
                             treeList.push(newNode);
                         }
@@ -112,7 +112,7 @@ function addChildNodes(event, treeId, treeNode){
                                 name: data[i].name,
                                 newName: data[i].newName,
                                 sysFlag: sysFlag,
-								selfId: data[i].name.split('-')[0]
+                                selfId: data[i].selfId
                             }
                             treeList.push(newNode);
                         }

power-dao/src/main/java/com/manage/dao/User_Dept_MenuMapper.java

@@ -11,4 +11,6 @@ public interface User_Dept_MenuMapper {
     List<User_Dept_Menu> selectAllMenusByUserIdAndSysFlag(@Param("userId")Integer userId,@Param("sysFlag")String sysFlag);
 
     List<User_Dept_Menu> validUserRoleMenu(@Param("userId")Integer userId, @Param("url")String url);
+
+    List<User_Dept_Menu> selectMenuListByRoleId(@Param("userName") String userName,@Param("sysFlag") String sysFlag);
 }

power-dao/src/main/resources/mapper/User_Dept_MenuMapper.xml

@@ -1023,4 +1023,49 @@
             AND sys_flag = #{sysFlag}
         </if>
     </select>
+    <!--针对roleId=-100的医院管理员用户名查询的菜单权限-->
+    <select id="selectMenuListByRoleId" resultMap="BaseResultMap">
+        SELECT
+            sys.dict_id sys_id,
+            hospital.hospital_name,
+            power_dept.dept_id,
+            power_dept.dept_name,
+            power_dept.dept_code,
+            sys.sys_flag,
+            sys.sys_name,
+            hospital.dict_id hospital_id,
+            sys.sys_type,
+            sys.sort,
+            power_user.user_id,
+            power_user.user_name,
+            power_user.user_tel,
+            power_user.user_email,
+            power_user.role_id,
+            power_role.role_name,
+            power_menu.menu_id,
+            power_menu.menu_name,
+            power_menu.menu_icon,
+            power_menu.menu_url,
+            power_menu.method,
+            power_menu.function_type method_type,
+            power_menu.parent_id method_parent,
+            power_menu.sort method_sort
+        FROM
+            power_user
+        LEFT JOIN power_user_dict ON power_user.user_id = power_user_dict.user_id
+        INNER JOIN power_role ON power_user.role_id = power_role.role_id
+        LEFT JOIN power_sys_dict sys ON power_user_dict.dict_id = sys.parent_id
+        AND sys.dict_status = 1
+        LEFT JOIN power_sys_dict hospital ON power_user_dict.dict_id = hospital.dict_id
+        INNER JOIN power_menu ON sys.sys_flag = power_menu.sys_flag
+        AND power_menu.effective = 1
+        LEFT JOIN power_dept ON FIND_IN_SET(
+            power_dept.dept_id,
+            power_user.dept_id
+        )
+        AND power_dept.effective = 1
+        WHERE
+            user_name = #{userName}
+        AND power_menu.sys_flag = #{sysFlag}
+    </select>
 </mapper>

power-service/src/main/java/com/manage/service/ipml/User_Dept_MenuServiceImpl.java

@@ -29,8 +29,13 @@ public class User_Dept_MenuServiceImpl implements User_Dept_MenuService {
     @Override
     public List<User_Dept_Menu> selectAll(String userName,String sysFlag,Integer userId,Integer roleId,
                                           Integer sysId,Integer hospitalId) {
+        if("-100".equals(roleId)){
+            //针对查询菜单权限
+            return userDeptMenuMapper.selectMenuListByRoleId(userName, sysFlag);
+        }else{
             return userDeptMenuMapper.selectAll(userName, sysFlag, userId, roleId, sysId, hospitalId);
         }
+    }
 
     @Override
     public List<User_Dept_Menu> selectAllMenusByUserIdAndSysFlag(Integer userId, String sysFlag) {