后端权限过滤处理

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.operationManagementCenter.entity.OrderQuality;
 import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -20,5 +21,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface OrderQualityMapper extends SuperMapper<OrderQuality> {
-    IPage<OrderQuality> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<OrderQuality> queryWrapper);
+    IPage<OrderQuality> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<OrderQuality> queryWrapper, DataScope dataScope);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.entity.TTaskTestUnqualifiedBom;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -19,5 +20,5 @@ import java.util.Map;
  */
 @Repository
 public interface TTaskTestUnqualifiedBomMapper extends SuperMapper<TTaskTestUnqualifiedBom> {
-    IPage<TTaskTestUnqualifiedBom> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<TTaskTestUnqualifiedBom> queryWrapper);
+    IPage<TTaskTestUnqualifiedBom> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<TTaskTestUnqualifiedBom> queryWrapper, DataScope dataScope);
 }

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

@@ -21,6 +21,7 @@ import com.github.zuihou.business.productionResourceCenter.entity.Productionreso
 import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.context.BaseContextHandler;
+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 lombok.extern.slf4j.Slf4j;
@@ -49,6 +50,6 @@ public class OrderQualityServiceImpl extends SuperServiceImpl<OrderQualityMapper
 
     @Override
     public IPage<OrderQuality> pageList(IPage page, LbqWrapper<OrderQuality> wrapper) {
-        return baseMapper.pageList(page, wrapper);
+        return baseMapper.pageList(page, wrapper, new DataScope());
     }
 }

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

@@ -20,6 +20,7 @@ import com.github.zuihou.common.constant.CacheKey;
 import com.github.zuihou.common.constant.CodeRuleModule;
 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.security.model.SysUser;
@@ -50,7 +51,7 @@ public class TTaskTestUnqualifiedBomServiceImpl extends SuperServiceImpl<TTaskTe
     private OrderMapper orderMapper;
     @Override
     public IPage<TTaskTestUnqualifiedBom> pageList(IPage page, LbqWrapper<TTaskTestUnqualifiedBom> 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/operationManagementCenter/OrderProductMapper.xml

@@ -21,7 +21,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,plan_id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,completeNum,qualifiedCount,
-        order_id, bom_id, bom_num, orderDeliveryTime, remark, create_user, update_user, produce_status,orderName
+        order_id, bom_id, bom_num, orderDeliveryTime, remark, create_user, update_user, produce_status,orderName,org_id
     </sql>
 
     <!-- 分页 -->
@@ -30,11 +30,12 @@
         <include refid="Base_Column_List"/>
         from (select a.*,a.plan_bom_num as bom_num, b.name as bomName,b.no as bomNo,b.specifications ,b.model,b.brand,
         ifnull(completeNum, 0) as completeNum,d.start_time as orderDeliveryTime, ifnull(unqualifiedCount,0) as unqualifiedCount, IFNULL(qualifiedCount, 0) as qualifiedCount,
-        ifnull(addOrderCount,0) as addOrderCount ,d.produce_status, ioo.order_name AS  orderName
+        ifnull(addOrderCount,0) as addOrderCount ,d.produce_status, ioo.order_name AS  orderName,z.org_id
         from imcs_p_plan_product a
         left join imcs_b_bom b on a.bom_id = b.id
         left join imcs_p_plan d on a.plan_id = d.id
         left join imcs_o_order ioo on a.order_id = ioo.id
+        left join imcs_z_zone z on b.zone_id = z.id
         LEFT JOIN
         (select order_product_id,count(u.add_order_id) as addOrderCount from
         imcs_t_task_test_unqualified_bom u

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

@@ -40,16 +40,17 @@
         id,create_time,create_user,update_time,update_user,
         order_no, order_name, order_id,task_id,workpiece_id,workpiece_name,procedure_id,procedure_name,measuring_type,measuring_program,ok_flag,
         sketchy_xaxis_offset,sketchy_yaxis_offset,sketchy_zaxis_offset,sketchy_aaxis_offset,sketchy_baxis_offset,sketchy_caxis_offset,
-        exact_xaxis_offset,exact_yaxis_offset,exact_zaxis_offset,exact_aaxis_offset,exact_baxis_offset,exact_caxis_offset,measuring_report
+        exact_xaxis_offset,exact_yaxis_offset,exact_zaxis_offset,exact_aaxis_offset,exact_baxis_offset,exact_caxis_offset,measuring_report,org_id
     </sql>
 
     <!-- 分页 -->
     <select id="pageList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from (select w.*, o.order_name
+        from (select w.*, o.order_name,z.org_id
         from imcs_order_quality_info w
             left join imcs_o_order o on w.order_id = o.id
+            left join imcs_z_zone z on o.zone_id = z.id
         ) s ${ew.customSqlSegment}
     </select>
 

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

@@ -35,7 +35,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_user,create_time,update_time,update_user,bom_num,no,
-        task_id, task_no, order_id, order_no,order_name, plan_id, plan_no, procedure_id, bom_id, bom_name, create_user_name, handle_time, handle_user, handle_user_name, test_result, add_order_id, add_order_no,handle_way, handle_status, unique_code,procedureNo,procedureName,orderName,addOrderName
+        task_id, task_no, order_id, order_no,order_name, plan_id, plan_no, procedure_id, bom_id, bom_name, create_user_name, handle_time, handle_user, handle_user_name, test_result, add_order_id, add_order_no,handle_way, handle_status, unique_code,procedureNo,procedureName,orderName,addOrderName,org_id
     </sql>
 
     <!-- 分页 -->
@@ -47,12 +47,14 @@
         a.*, p. NO procedureNo,
         p. NAME procedureName,
         o.order_name orderName,
-        o1.order_name addOrderName
+        o1.order_name addOrderName,
+        z.org_id
         FROM
         imcs_t_task_test_unqualified_bom a
         LEFT JOIN imcs_b_bom_procedure p ON a.procedure_id = p.id
         LEFT JOIN imcs_o_order o ON a.order_id = o.id
         LEFT JOIN imcs_o_order o1 ON a.add_order_id = o1.id
+        LEFT JOIN imcs_z_zone z ON o.zone_id = z.id
         ) s ${ew.customSqlSegment}
     </select>