diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index dc5a623a..e34a7750 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -815,8 +815,12 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + Integer role = userToken.getIsadmin(); + if (role == null) { + role = 1; + } mv.setViewName("pages/application/application-out"); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { + if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(4,role) == 0) { mv.setViewName("pages/applicationForStorageCenter/application-out"); } return mv; @@ -831,7 +835,11 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { + Integer role = userToken.getIsadmin(); + if (role == null) { + role = 1; + } + if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(4,role) == 0) { mv.setViewName("pages/applicationForStorageCenter/application-out_back"); } InventoryP inventoryP = new InventoryP(); @@ -2050,10 +2058,13 @@ public class PageController { gidList.add(gid); } else if ("more".equals(type)) { } - + Integer role = userToken.getIsadmin(); + if (role == null) { + role = 1; + } mv.addObject("gidList", gidList); mv.setViewName("pages/group/applicationOutForGroup"); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { + if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role,4) == 0) { mv.setViewName("pages/applicationForStorageCenter/applicationOutForGroup"); } return mv;