Newspaper 2 maanden geleden
bovenliggende
commit
85669ddd61

+ 4 - 1
app-admin/src/main/java/com/ruoyi/web/service/impl/EmergencyServiceImpl.java

@@ -299,7 +299,10 @@ public class EmergencyServiceImpl extends ServiceImpl<EmergencyMapper, Emergency
         // 处理 下达人信息
         Integer issuerId = emergency.getIssuerId();
         PersonInfoVO issuerInfoVO = new PersonInfoVO();
-        if (issuerId == 1) {
+//        if (issuerId == 1) {
+//            issuerInfoVO.setRealname("超级管理员");
+//            issuerInfoVO.setUserId(1);
+        if (SecurityUtils.isAdmin(issuerId.longValue())) {
             issuerInfoVO.setRealname("超级管理员");
             issuerInfoVO.setUserId(1);
         } else {

+ 2 - 1
app-admin/src/main/java/com/ruoyi/web/service/impl/EventServiceImpl.java

@@ -330,7 +330,8 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event>
         if (ObjectUtil.isNotEmpty(eventAssign)){
             // 事件已经处理 有处理人
             Integer userId = eventAssign.getUserId();
-            if (userId == 1) {
+            //if (userId == 1) {
+            if (SecurityUtils.isAdmin(userId.longValue())) {
                 eventVO.setProcessUserName("超级管理员");
             }else{
                 QueryWrapper<PersonInfo> queryWrapper2 = new QueryWrapper<>();