修改接口

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -141,18 +141,10 @@ public class SysUserController extends PaginationController<SysUser> {
     @ApiImplicitParam(name = "modelId", value = "前台菜单10  后台菜单20", required = true, dataType = "varchar", paramType = "path")
     @GetMapping("/queryMenuById")
     public Result queryMenu(CurUser curUser,String modelId) {
-        //获取用户菜单
-        List<QueryMenuResDTO> menu = userServiceImpl.queryMenusById(curUser.getCorpId(),curUser.getUserId(),modelId);
-        //获取用户状态
-        SysUser state = userServiceImpl.getUserState(curUser.getUserId());
-        Map<String,Object> map = new HashMap<>();
-        map.put("massage","用户未启用");
-        map.put("code","400");
-
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                (state.getDelFlag().equals("1")||state.getFlag().equals("0"))?map:menu);
+                userServiceImpl.queryMenusById(curUser,modelId));
     }
 
     /**

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -282,4 +282,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select("select * from s_user where account_id in(${accountId}) and corp_id = #{corpId}")
     @ResultMap(value = "BaseResultMap")
     List<SysUser> getBusinessIdByAccountId(@Param("accountId") String accountId ,@Param("corpId")String corpId);
+
+
+    @Select("select count(0) from s_user where del_flag != 1 and flag = 1 and corp_id = #{corpId} and business_id = #{userId}")
+    int getUserflag (CurUser curUser);
 }

src/main/java/org/rcisoft/sys/user/service/SysUserService.java

@@ -36,7 +36,7 @@ public interface SysUserService {
 
     List<SysMenu> queryUserMenus(CurUser user);
 
-    List<QueryMenuResDTO> queryMenusById(String corpId, String id, String modelId);
+    Object queryMenusById(CurUser curUser, String modelId);
 
     SysUser getUserState(String id);
 

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -222,9 +222,17 @@ public class SysUserServiceImpl implements SysUserService {
     }
 
     @Override
-    public List<QueryMenuResDTO> queryMenusById(String corpId, String id, String modelId) {
+    public Object queryMenusById(CurUser curUser, String modelId) {
+        //查询登录人启用状态
+        int x = sysUserMapper.getUserflag(curUser);
+        if(x < 1){
+            Map<String,Object>  map = new HashedMap();
+            map.put("massage","用户未启用");
+            map.put("code",400);
+            return map;
+        }
 
-        List<QueryMenuResDTO> menus = sysUserMapper.queryMenus(corpId, id, modelId);
+        List<QueryMenuResDTO> menus = sysUserMapper.queryMenus(curUser.getCorpId(), curUser.getUserId(), modelId);
         String[] strings = new String[]{"题库管理", "试卷管理", "统计分析"};
         QueryMenuResDTO newMenu = new QueryMenuResDTO();
         newMenu.setMenuName("在线考试");
@@ -253,6 +261,15 @@ public class SysUserServiceImpl implements SysUserService {
     @Override
     public Object queryAllRoleById(CurUser curUser) {
         List<String> roles = sysUserMapper.queryAllRoleById(curUser);
+        //查询登录人启用状态
+        int x = sysUserMapper.getUserflag(curUser);
+        if(x < 1){
+            Map<String,Object>  map = new HashedMap();
+            map.put("massage","用户未启用");
+            map.put("code",400);
+            return map;
+        }
+
         StringBuffer sb = new StringBuffer();
         if(roles != null && roles.size() > 0){
             for(String role : roles){
@@ -268,8 +285,8 @@ public class SysUserServiceImpl implements SysUserService {
 
         }else {
             Map<String,Object> map = new HashedMap();
-            map.put("massage","用户未启用或无权限");
-            map.put("code",400);
+            map.put("massage","用户启用但无权限");
+            map.put("code",500);
             return map;
         }
     }