问题处理

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionSchedulingServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -29,8 +30,13 @@ public class ProductionSchedulingServiceImpl extends ServiceImpl<ProductionSched
     @Override
     public Map<String, List<ProductionSchedulingVo>> listMap(ProductionSchedulingSelectDto dto) {
         IWrapper<ProductionScheduling> wrapper = getWrapper();
-        //权限过滤：生产排程统计
-        wrapper.eq("ps", ProductionScheduling::getCompanyId, SecurityUtils.getCompanyId());
+        //权限过滤：生产排程统计 总公司看全部,子公司自己看自己
+        Long companyId = SecurityUtils.getCompanyId();
+        if (!Objects.equals(companyId, 100L)) {
+            wrapper.eq("ps", ProductionScheduling::getCompanyId, companyId);
+        } else {
+            wrapper.eq("ps", ProductionScheduling::getCompanyId, dto.getCompanyId());
+        }
         //数据分组
         wrapper.groupBy("ps.scheduling_date", "ps.processes_id");
         //时间范围过滤