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 edf0670a..e95b2504 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1631,6 +1631,15 @@ public class PageController { recordP.setUnit(sumUnit.toString()); mv.addObject("record", recordP); mv.addObject("recordMinList", applicationOutRecordMinByParent); + Integer role = userToken.getIsadmin(); + if (role == null) { + role = 1; + } + if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role, 4) == 0 ) { + mv.addObject("display", "table-row"); + } else { + mv.addObject("display", "none"); + } return mv; } @@ -1860,6 +1869,13 @@ public class PageController { mv.addObject("edisplay", "none"); } + if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role, 4) == 0) { + mv.addObject("pdisplay", "table-row"); + } else { + mv.addObject("pdisplay", "none"); + + } + mv.addObject("recordMinP", recordMinP); @@ -2027,7 +2043,7 @@ public class PageController { } if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role, 4) == 0) { - mv.addObject("display", "inline-block"); + mv.addObject("display", "table-row"); } else { mv.addObject("display", "none"); diff --git a/src/main/resources/templates/pages/application/application-review.html b/src/main/resources/templates/pages/application/application-review.html index 89ca83fd..67c9f845 100644 --- a/src/main/resources/templates/pages/application/application-review.html +++ b/src/main/resources/templates/pages/application/application-review.html @@ -55,7 +55,7 @@