添加应用查询

user_auth/src/main/java/com/huaxu/dao/UserMapper.java

@@ -101,4 +101,8 @@ public interface UserMapper {
      */
     int insertRegister(User user);
     List<MenuEntity> findUserFirstMenu(@Param("tenantId") String tenantId, @Param("userId") Integer userId);
+
+    List<MenuEntity> findAllFirstMenu();
+
+    List<MenuEntity> findTenantFirstMenu(String tenantId);
 }

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -248,7 +248,7 @@ public class UserServiceImpl implements UserService {
         OAuth2Authentication oAuth2Authentication = (OAuth2Authentication) SecurityContextHolder.getContext().getAuthentication();
         LoginUser loginUser = (LoginUser) oAuth2Authentication.getPrincipal();
         //放置系统级菜单对应用户appid
-        loginUser.setAppIds(findUserFirstMenu(user.getTenantId(),user.getId()));
+        loginUser.setAppIds(findUserFirstMenu(user.getTenantId(),user.getId(),user.getUserType()));
         loginUser.setProgramItemList(programItems);
         loginUser.setName(user.getUsername());
         loginUser.setId(user.getId());
@@ -348,10 +348,28 @@ public class UserServiceImpl implements UserService {
 
         return permissionList.get(0);
     }
-    private List<String> findUserFirstMenu(String tenantId,  Integer userId){
+    private List<String> findUserFirstMenu(String tenantId,  Integer userId,String userType){
+        List<MenuEntity> menuEntities = userMapper.findUserFirstMenu(tenantId, userId);
+        switch (userType) {
+//			case "1"://超级管理员查询所有系统菜单
+//				menuEntities = menuMapper.findAllFirstMenu();
+//				break;
+//			case "2"://普通用户按角色查询租户菜单
+//				menuEntities = menuMapper.findUserFirstMenu(currentUser.getTenantId(),userId);
+//				break;
+            case "-9999"://超级管理员查询所有系统菜单
+                menuEntities = userMapper.findAllFirstMenu();
+                break;
+            case "-999"://租户管理员查询租户菜单
+                menuEntities = userMapper.findTenantFirstMenu(tenantId);
+                break;
+            default:	//其他租户用户暂时不区分类型
+                menuEntities = userMapper.findUserFirstMenu(tenantId,userId);
+                break;
+        }
         List<String>appIds=new ArrayList<>();
-        List<MenuEntity> userFirstMenu = userMapper.findUserFirstMenu(tenantId, userId);
-        userFirstMenu.forEach(menuEntity -> {
+
+        menuEntities.forEach(menuEntity -> {
             appIds.add(menuEntity.getAppId());
         });
         return appIds;

user_auth/src/main/resources/application-dev.properties

@@ -7,7 +7,7 @@ spring.datasource.url=jdbc:mysql://114.135.61.188:33306/uims?characterEncoding=u
 spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
+spring.datasource.hikari.max-lifetime=30000
 mybatis-plus.mapper-locations=classpath:mapper/*.xml
 mybatis-plus.type-aliases-package=com.huaxu.entity
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl

user_auth/src/main/resources/mapper/UserMapper.xml

@@ -284,23 +284,35 @@
         insert into uims_user_register( ID, USERNAME, PHONE, USER_TYPE,	REMARK,	STATUS,	CREATE_BY,DATE_CREATE,UPDATE_BY,DATE_UPDATE)
         values ( #{id}, #{username}, #{phone}, #{userType}, #{remark}, 1, #{createBy}, #{dateCreate}, #{updateBy}, #{dateUpdate})
     </insert>
+    <!--  超级管理员查询 一级菜单List   -->
+    <select id="findAllFirstMenu" resultType="com.huaxu.entity.MenuEntity">
+        SELECT
+         a.app_id appId
+        FROM uims_menu a
+        <where>
+            a.status=1 and a.PARENT_MENU_ID=0 and a.SHOW_STATE=1 and  a.is_admin=1
+        </where>
+
+    </select>
+    <!--  租户管理员查询租户菜单  -->
+    <select id="findTenantFirstMenu" resultType="com.huaxu.entity.MenuEntity">
+        select
+         a.app_id appId
+        from uims_tenant_menu b
+        inner join uims_menu a on a.id= b.MENU_ID and a.status=1
+        <where>
+            b.status=1 and a.PARENT_MENU_ID=0 and a.show_state=1 and a.is_tenant=1
+            <if test="tenantId != null  and tenantId != ''">
+                and b.tenant_id = #{tenantId}
+            </if>
+        </where>
+        order by b.MENU_SEQ
+    </select>
     <select id="findUserFirstMenu" resultType="com.huaxu.entity.MenuEntity">
         SELECT
-        a.id as "id" ,
-        a.parent_menu_id as "parentMenuId" ,
-        a.app_id as appId,
-        b.MENU_NAME as "name" ,
-        b.MENU_IMAGE as "menuImage" ,
-        a.permission_flag as "permissionFlag" ,
-        b.LINK_PATH as "linkPath" ,
-        b.MENU_SEQ as "seq" ,
-        a.show_state as "showState" ,
-        b.remark as "remark" ,
-        b.date_create as "dateCreate" ,
-        b.create_by as "createBy" ,
-        b.date_update as "dateUpdate" ,
-        b.update_by as "updateBy" ,
-        b.status as "status"
+
+        a.app_id as appId
+
         from uims_user_role  userrole
         inner join uims_role_menu rolemenu on rolemenu.ROLE_ID=userrole.ROLE_ID and rolemenu.status=1
         inner join uims_menu a on a.id=rolemenu.MENU_ID and a.STATUS=1