修改bug

src/main/java/com/care/bms/service/BmsEventOrderService.java

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

src/main/java/com/care/common/mapper/CareEventOrderMapper.java

@@ -14,6 +14,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface CareEventOrderMapper extends BaseMapper<CareEventOrder> {
 
-    EventStaVO statOrder(@Param("orgId") Long orgId, @Param("stationId")Long stationId, @Param("chambId")Long chambId, @Param("deviceCode")String deviceCode);
+    EventStaVO statOrder(@Param("orgId") Long orgId, @Param("stationId")Long stationId, @Param("userChambId")Long userChambId, @Param("chambId")Long chambId, @Param("deviceCode")String deviceCode);
 
 }

src/main/java/com/care/common/service/CareEventOrderService.java

@@ -17,7 +17,7 @@ public interface CareEventOrderService extends IService<CareEventOrder> {
      * @param stationId
      * @return
      */
-    EventStaVO statOrder(Long orgId, Long stationId, Long chambId, String deviceCode);
+    EventStaVO statOrder(Long orgId, Long stationId,Long userChambId, Long chambId, String deviceCode);
 
     boolean saveHisOrder(CareEventOrder order,CareEventOrder orderDb,boolean isCancel);
 

src/main/java/com/care/common/service/impl/CareEventOrderServiceImpl.java

@@ -76,8 +76,8 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
      * @return
      */
     @Override
-    public EventStaVO statOrder(Long orgId, Long stationId, Long chambId, String deviceCode) {
-        return this.baseMapper.statOrder(orgId,stationId, chambId, deviceCode);
+    public EventStaVO statOrder(Long orgId, Long stationId, Long userChambId,Long chambId, String deviceCode) {
+        return this.baseMapper.statOrder(orgId,stationId, userChambId,chambId, deviceCode);
     }
 
     /**

src/main/resources/mybatis/CareEventOrderMapper.xml

@@ -17,6 +17,9 @@
             <if test="stationId != null ">
                 AND station_id = #{stationId}
             </if>
+            <if test="userChambId != null ">
+                AND (select chamb_id from care_event_order_chamb where care_event_order_chamb.order_id = care_event_order.id) = #{userChambId}
+            </if>
             <if test="chambId != null ">
                 AND (select chamb_id from care_event_order_chamb where care_event_order_chamb.order_id = care_event_order.id) = #{chambId}
             </if>