解决后台数据权限隔离和统计错误的bug

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -155,7 +155,7 @@ public class TaskWorkNode {
 
     private final String fileName = "";
 
-    private static ReentrantLock lock = new ReentrantLock(true);
+    private static ReentrantLock lock = new ReentrantLock();
 
     public void updateTaskStatusJob(String data, String consumerQueue) throws InterruptedException {
         String returnData = "";

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/TTaskMapper.java

@@ -7,6 +7,7 @@ import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.operationManagementCenter.entity.Plan;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 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;
 
@@ -29,7 +30,7 @@ public interface TTaskMapper extends SuperMapper<TTask> {
     int getTaskCount(Map map);
     List<TTask> getTaskResource();
 
-    IPage<TTask> pageList(IPage page, @Param("mulPlanStatus")String mulPlanStatus, @Param(Constants.WRAPPER) Wrapper<TTask> queryWrapper);
+    IPage<TTask> pageList(IPage page, @Param("mulPlanStatus")String mulPlanStatus, @Param(Constants.WRAPPER) Wrapper<TTask> queryWrapper, DataScope dataScope);
 
     int updateTaskBegin();
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/TaskService.java

@@ -12,7 +12,6 @@ import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedure;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureProductionresource;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -53,7 +52,7 @@ public interface TaskService extends SuperService<TTask> {
      /**
       * 分页
       */
-     IPage<TTask> pageList(IPage page,String mulPlanStatus, LbqWrapper<TTask> wrapper);
+     IPage<TTask> pageList(IPage page, String mulPlanStatus, LbqWrapper<TTask> wrapper);
 
      /**
       * 排产调度数量统计

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -2,7 +2,6 @@ package com.github.zuihou.business.operationManagementCenter.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.authority.dao.auth.StationUserLoginInfoMapper;
 import com.github.zuihou.authority.dao.auth.UserMapper;
@@ -42,9 +41,9 @@ import com.github.zuihou.common.constant.CodeRuleModule;
 import com.github.zuihou.common.constant.ParameterKey;
 import com.github.zuihou.common.util.DateUtil;
 import com.github.zuihou.common.util.StringUtil;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
-import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.tenant.service.CodeRuleService;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
@@ -55,7 +54,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
-import java.text.NumberFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -919,8 +917,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     }
 
     @Override
-    public IPage<TTask> pageList(IPage page,String mulPlanStatus, LbqWrapper<TTask> wrapper) {
-        return baseMapper.pageList(page, mulPlanStatus,wrapper);
+    public IPage<TTask> pageList(IPage page, String mulPlanStatus, LbqWrapper<TTask> wrapper) {
+        return baseMapper.pageList(page, mulPlanStatus,wrapper, new DataScope());
     }
 
     @Override

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/CuttingToolApplyMapper.java

@@ -27,5 +27,5 @@ public interface CuttingToolApplyMapper extends SuperMapper<CuttingToolApply> {
 
     void markProcessStatus(CuttingToolApply cuttingToolApply);
 
-    IPage<CuttingToolApply> findPageByQueryWrapper(IPage<CuttingToolApply> page,@Param(Constants.WRAPPER) QueryWrapper<CuttingToolApply> queryWrapper);
+    IPage<CuttingToolApply> findPageByQueryWrapper(IPage<CuttingToolApply> page,@Param(Constants.WRAPPER) QueryWrapper<CuttingToolApply> queryWrapper, DataScope dataScope);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/CuttingToolApplyServiceImpl.java

@@ -77,7 +77,7 @@ public class CuttingToolApplyServiceImpl extends SuperCacheServiceImpl<CuttingTo
 
     @Override
     public IPage<CuttingToolApply> findPageByQueryWrapper(IPage<CuttingToolApply> page, QueryWrapper<CuttingToolApply> queryWrapper){
-        return baseMapper.findPageByQueryWrapper(page, queryWrapper);
+        return baseMapper.findPageByQueryWrapper(page, queryWrapper, new DataScope());
     }
 
 }

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StockInfoMapper.xml

@@ -101,7 +101,7 @@
             SELECT  h.id, h.parent_id, h.name as bname, h1.name as aname, h1.status
             FROM imcs_s_shelves h LEFT JOIN imcs_s_shelves h1 ON h.parent_id = h1.id
         ) b ON s.shelves_id = b.id
-        LEFT JOIN imcs_z_zone z ON Locate(z.abbreviate, b.aname)
+        LEFT JOIN imcs_z_zone z ON Locate(z.abbreviate, left(b.aname,5))
         where b.status = 1
         <if test="orgIds != null and orgIds != ''">
             and z.org_id in (${orgIds})

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/OrderQualityMapper.xml

@@ -45,7 +45,7 @@
     <!-- 分页 -->
     <select id="pageList" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>,org_id
         from (select w.*, o.order_name AS orderName,z.org_id, itw.unique_code AS uniqueCode
         from imcs_order_quality_info w
             left join imcs_o_order o on w.order_id = o.id

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/CuttingToolApplyMapper.xml

@@ -104,19 +104,22 @@
                 ibb.parts_alias AS productNo,
                 ibb.name AS partName,
                 ibbp.no AS procedureNo,
-                ibbp.name AS procedureName
+                ibbp.name AS procedureName,
+                izz.org_id
             FROM imcs_cutting_tool_apply icta,
                 imcs_p_plan_product ippp,
                 imcs_o_order_product ioop,
                 imcs_o_order ioo,
                 imcs_b_bom ibb,
-                imcs_b_bom_procedure ibbp
+                imcs_b_bom_procedure ibbp,
+                imcs_z_zone izz
             WHERE icta.plan_id = ippp.plan_id
             AND ippp.bom_id = ibb.id
             AND ippp.bom_id = ioop.bom_id
             AND ippp.order_id = ioop.order_id
             AND ioop.order_id = ioo.id
             AND icta.produce_id = ibbp.id
+            AND ioo.zone_id = izz.id
             ) tmp ${ew.customSqlSegment}
     </select>