Browse Source

修改bug

suntianwu 3 years ago
parent
commit
ea59d90fc6
1 changed files with 12 additions and 1 deletions
  1. 12 1
      src/main/java/com/care/bms/service/BmsEventOrderService.java

+ 12 - 1
src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -1055,11 +1055,22 @@ public class BmsEventOrderService {
      * @return
      * @return
      */
      */
     public  EventStaVO statOrder(UserLogindConvertVO loginUser, Long chambId, String deviceCode) {
     public  EventStaVO statOrder(UserLogindConvertVO loginUser, Long chambId, String deviceCode) {
+        Long userOrgId = null;
+        if(UserRoleEnum.ORG.getValue().equals(loginUser.getRole())){
+            userOrgId = loginUser.getOrgId();
+        }
+        Long userStationId = null;
+        if(UserRoleEnum.STATION.getValue().equals(loginUser.getRole())){
+            userOrgId = loginUser.getOrgId();
+            userStationId = loginUser.getStationId();
+        }
         Long userChambId = null;
         Long userChambId = null;
         if(UserRoleEnum.CHANMB.getValue().equals(loginUser.getRole())){
         if(UserRoleEnum.CHANMB.getValue().equals(loginUser.getRole())){
+            userOrgId = loginUser.getOrgId();
+            userStationId = loginUser.getStationId();
             userChambId = loginUser.getId();
             userChambId = loginUser.getId();
         }
         }
-        return this.careEventOrderService.statOrder(loginUser.getOrgId(),loginUser.getStationId(),userChambId, chambId, deviceCode);
+        return this.careEventOrderService.statOrder(userOrgId,userStationId,userChambId, chambId, deviceCode);
     }
     }
 
 
     /**
     /**