解决权限隔离bug

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/statisticalAnalysis/dao/ProductLinePerformanceMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.externalApi.entity.AgvHikOrderDetailInfo;
 import com.github.zuihou.business.operationManagementCenter.entity.TaskNode;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -25,7 +26,7 @@ public interface ProductLinePerformanceMapper extends SuperMapper<TaskNode> {
     /**
      * 分页
      */
-    IPage<TaskNode> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<TaskNode> queryWrapper);
+    IPage<TaskNode> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<TaskNode> queryWrapper, DataScope dataScope);
 
     /**
      *

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/statisticalAnalysis/impl/ProductLinePerformanceServiceImpl.java

@@ -10,6 +10,7 @@ import com.github.zuihou.business.operationManagementCenter.entity.TaskNode;
 import com.github.zuihou.business.statisticalAnalysis.ProductLinePerformanceService;
 import com.github.zuihou.business.statisticalAnalysis.dao.ProductLinePerformanceMapper;
 import com.github.zuihou.common.constant.CacheKey;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.injection.annonation.InjectionResult;
 import com.github.zuihou.utils.BeanPlusUtil;
@@ -44,7 +45,7 @@ public class ProductLinePerformanceServiceImpl extends SuperCacheServiceImpl<Pro
     @Override
     @InjectionResult
     public IPage<TaskNode> pageList(IPage page, LbqWrapper<TaskNode> wrapper) {
-        return baseMapper.pageList(page, wrapper);
+        return baseMapper.pageList(page, wrapper, new DataScope());
     }
 
     @Override

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/statisticalAnalysis/ProductLinePerformanceMapper.xml

@@ -3,10 +3,11 @@
 <mapper namespace="com.github.zuihou.business.statisticalAnalysis.dao.ProductLinePerformanceMapper">
     <!-- 分页 -->
     <select id="pageList" resultType="com.github.zuihou.business.operationManagementCenter.entity.TaskNode">
-        SELECT tmp1.productionlineId,tmp1.productionlineName,tmp1.statisticalDate,SUM(TIMESTAMPDIFF(MINUTE, tmp1.start_time, tmp1.end_time) / 60) AS statisticalHours FROM
+        SELECT tmp1.productionlineId,tmp1.productionlineName,tmp1.statisticalDate,SUM(TIMESTAMPDIFF(MINUTE, tmp1.start_time, tmp1.end_time) / 60) AS statisticalHours, tmp1.org_id FROM
         (SELECT
           izz.id AS productionlineId,
           izz.name AS productionlineName,
+          izz.org_id,
           date_format(d.start_time,'%Y-%m') AS statisticalDate,
           d.start_time,
           d.end_time