From 7abdf614548bfc46e8058f1421ccea1d0a22f46c Mon Sep 17 00:00:00 2001 From: haha Date: Thu, 12 Oct 2023 23:34:17 +0800 Subject: [PATCH] update code --- .../src/main/java/com/ruoyi/common/utils/SecurityUtils.java | 2 +- .../web/controller/ProjectQuarterlyAssessController.java | 6 ------ .../bigscreen/web/controller/ProjectScheduleController.java | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java index 451f72a2..465b327c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java @@ -46,7 +46,7 @@ public class SecurityUtils } catch (Exception e) { - throw new ServiceException("获取RoleID异常", HttpStatus.UNAUTHORIZED); + return 0; } } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java index 8d32e2bd..0bf4930d 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java @@ -60,12 +60,6 @@ public class ProjectQuarterlyAssessController extends BaseController { if(obj!=null){ return AjaxResult.success(obj); } - Long deptId= where.getDeptId(); - if(deptId==null || deptId<=0){ - if (SecurityUtils.isUserB()) { - where.setPrjIds(getProjectIds()); - } - } List list=smzProjectQuarterlyAssessService.queryByProjectType(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java index 430efd63..81df5125 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java @@ -45,11 +45,6 @@ public class ProjectScheduleController extends BaseController { SurProjectScheduleWhere where =new SurProjectScheduleWhere(); where.setPrjType(type); where.setDeptId(deptId); - if(deptId==null || deptId<=0){ - if (SecurityUtils.isUserB()) { - where.setPrjIds(getProjectIds()); - } - } List list=isurProjectScheduleService.selectByProjectType(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list);