0614

src/main/java/cn/ezhizao/framework/web/controller/BaseController.java

@@ -24,11 +24,14 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.beans.PropertyEditorSupport;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -38,7 +41,8 @@ import java.util.stream.Collectors;
  */
 public class BaseController {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
-
+    @Resource
+    private HttpServletRequest request;
 
     /**
      * 将前台传递过来的日期格式的字符串，自动转化为Date类型
@@ -228,13 +232,18 @@ public class BaseController {
      */
     protected <T> void setTenantId(T t) throws NoSuchFieldException, IllegalAccessException {
         SysUser user = SecurityUtils.getLoginUser().getUser();
+        Long tenantId = request.getHeader("tenantId") != null && !Objects.equals(request.getHeader("tenantId"), "0") ? Long.parseLong(request.getHeader("tenantId")) : null;
         if (!user.isAdmin()) {
             Field field = t.getClass().getDeclaredField("tenantId");
             field.setAccessible(true);
-            field.set(t, user.getTenantId());
+            field.set(t, tenantId);
         }
     }
 
+    protected Long getTenantId() {
+        return request.getHeader("tenantId") != null && !Objects.equals(request.getHeader("tenantId"), "0") ? Long.parseLong(request.getHeader("tenantId")) : null;
+    }
+
     protected <T> boolean saveOrUpdateBatch(IService<T> service, List<T> newList, List<T> oldList) {
         // 批量保存/跟新 新数据 避免使用 saveOrUpdate() 方法 数据量超过50条就很卡了
         boolean bool =

src/main/java/cn/ezhizao/project/business/BizInspectionStandards/controller/BizInspectionStandardsController.java

@@ -43,6 +43,7 @@ public class BizInspectionStandardsController extends BaseController
     @Log(title = "检查标准列表", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizInspectionStandards bizInspectionStandards) throws NoSuchFieldException, IllegalAccessException
     {
+        setTenantId(bizInspectionStandards);
         List<BizInspectionStandards> list = bizInspectionStandardsService.getList(bizInspectionStandards);
         return getDataTable(list);
     }

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -102,7 +102,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
             bizDayworkAuxiliaryItem.setStartTimeString(time + " 00:00:00");
             bizDayworkAuxiliaryItem.setEndTimeString(time + " 23:59:59");
         }
-
+        setTenantId(bizDayworkAuxiliaryItem);
         List<BizDayworkAuxiliaryItem> list = bizDayworkAuxiliaryItemService.getList(bizDayworkAuxiliaryItem);
         List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", list.isEmpty() ? Collections.singletonList(0L) : list.stream().map(BizDayworkAuxiliaryItem::getDayworkId).collect(Collectors.toList())).list();
         list.forEach(e -> {
@@ -207,11 +207,11 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
     @PostMapping("/save")
     @Transactional
     @Log(title = "辅助工序报工保存", businessType = BusinessType.UPDATE)
-    public AjaxResult save (@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
+    public AjaxResult save (@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkAuxiliaryItem);
         bizDayworkAuxiliaryItem.setDayworkId(bizDayworkAuxiliaryItem.getDaywork().getId());
         bizDayworkAuxiliaryItem.setStartTime(new Date());
 //        List<BizDayworkItem> item = bizDayworkAuxiliaryItem.getDaywork().getDayworkItemList();
-        bizDayworkAuxiliaryItem.setTenantId(getLoginUser().getTenantId());
         bizDayworkAuxiliaryItem.setProductionPlanId(bizDayworkAuxiliaryItem.getDaywork().getProductionPlanId());
         bizDayworkAuxiliaryItem.setProductionPlanDetailId(bizDayworkAuxiliaryItem.getDaywork().getProductionPlanDetailId());
         bizDayworkAuxiliaryItem.setProductionPlanDetailSubDetailId(bizDayworkAuxiliaryItem.getDaywork().getProductionPlanDetailSubDetailId());
@@ -219,7 +219,6 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
         bizDayworkAuxiliaryItem.setLotCode(bizDayworkAuxiliaryItem.getDaywork().getLotCode());
         bizDayworkAuxiliaryItem.setTechnologicalProcessId(bizDayworkAuxiliaryItem.getDaywork().getTechnologicalProcessId());
         bizDayworkAuxiliaryItem.setStatus("0");
-        bizDayworkAuxiliaryItem.setTenantId(getLoginUser().getTenantId());
         bizDayworkAuxiliaryItem.setProductId(bizDayworkAuxiliaryItem.getDaywork().getProductId());
         List<BizDayworkAuxiliaryItemReject> rejects = new ArrayList<>();
 
@@ -296,7 +295,8 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
     @PostMapping("/finished")
     @Transactional
     @Log(title = "辅助工序报工结束", businessType = BusinessType.UPDATE)
-    public AjaxResult finishedV1(@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
+    public AjaxResult finishedV1(@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkAuxiliaryItem);
         // 添加报工废品
         bizDayworkAuxiliaryItem.setStatus("3");
         bizDayworkAuxiliaryItem.setEndTime(new Date());
@@ -325,6 +325,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
                     ll.setLotId(bizDayworkAuxiliaryItem.getLotId());
                     ll.setDayworkAuxiliaryItemId(bizDayworkAuxiliaryItem.getId());
                     ll.setDayworkAuxiliaryItemRejectId(l.getId());
+                    ll.setTenantId(bizDayworkAuxiliaryItem.getTenantId());
                     rejects.add(ll);
                 });
             }
@@ -428,7 +429,8 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
     @Transactional
     @PostMapping("/pause")
     @Log(title = "辅助工序报工暂存", businessType = BusinessType.UPDATE)
-    public AjaxResult pauseV1 (@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
+    public AjaxResult pauseV1 (@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkAuxiliaryItem);
         bizDayworkAuxiliaryItem.setStatus("1");
         bizDayworkAuxiliaryItemService.updateById(bizDayworkAuxiliaryItem);
         List<BizDayworkAuxiliaryItemReject> rejects = bizDayworkAuxiliaryItem.getRejectList();
@@ -447,6 +449,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
                     ll.setLotId(bizDayworkAuxiliaryItem.getLotId());
                     ll.setDayworkAuxiliaryItemId(bizDayworkAuxiliaryItem.getId());
                     ll.setDayworkAuxiliaryItemRejectId(l.getId());
+                    ll.setTenantId(bizDayworkAuxiliaryItem.getTenantId());
                     itemRejects.add(ll);
                 });
             }

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkController.java

@@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -95,6 +96,8 @@ public class BizDayworkController extends BaseController {
     private IBizReturnReceiptDetailService bizReturnReceiptDetailService;
     @Resource
     private IBizOutsourcedOrderDetailProcessService bizOutsourcedOrderDetailProcessService;
+    @Resource
+    HttpServletRequest request;
 
     /*
     @Transactional
@@ -2814,6 +2817,7 @@ public class BizDayworkController extends BaseController {
     @Transactional
     @PostMapping("/showDayworkSave")
     public AjaxResult addNewDayworkItem(@RequestBody List<BizDayworkItem> dayworkItemList) {
+        long tenantId = Long.parseLong(request.getHeader("tenantId"));
         // 新建报工明细
         List<BizDayworkItem> adds = new ArrayList<>();
         //dayworkID的所有报工
@@ -2864,7 +2868,7 @@ public class BizDayworkController extends BaseController {
             bizDayworkItem.setIsSort(l.getIsSort());
             bizDayworkItem.setDeptName(l.getDeptName());
             bizDayworkItem.setLotId(l.getDaywork().getLotId());
-            bizDayworkItem.setTenantId(l.getTenantId());
+            bizDayworkItem.setTenantId(tenantId);
             adds.add(bizDayworkItem);
         });
 
@@ -2874,6 +2878,7 @@ public class BizDayworkController extends BaseController {
     @Transactional
     @PostMapping("/showDayworkInnerSave")
     public AjaxResult addNewInnerDayworkItem(@RequestBody List<BizDayworkItem> dayworkItemList) {
+        long tenantId = Long.parseLong(request.getHeader("tenantId"));
         // 新建报工明细
         List<BizDayworkItem> adds = new ArrayList<>();
         //dayworkID的所有报工
@@ -2920,7 +2925,7 @@ public class BizDayworkController extends BaseController {
             bizDayworkItem.setDeptName(l.getDeptName());
             bizDayworkItem.setLotId(l.getDaywork().getLotId());
             bizDayworkItem.setOutsourceDetailId(l.getOutsourceDetailId());
-            bizDayworkItem.setTenantId(l.getTenantId());
+            bizDayworkItem.setTenantId(tenantId);
             bizDayworkItem.setIsWx(1);
             adds.add(bizDayworkItem);
         });

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.product.controller;
 
 import cn.ezhizao.common.exception.ServiceException;
 import cn.ezhizao.common.utils.SecurityUtils;
+import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
@@ -33,6 +34,7 @@ import cn.ezhizao.project.system.domain.SysDeptUser;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.mapper.SysDeptMapper;
 import cn.ezhizao.project.system.mapper.SysUserMapper;
+import cn.ezhizao.project.system.service.ISysConfigService;
 import cn.ezhizao.project.system.service.ISysDeptUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.transaction.annotation.Transactional;
@@ -113,6 +115,8 @@ public class BizDayworkItemController extends BaseController {
     private IBizTakeStockPeriodService bizTakeStockPeriodService;
     @Resource
     private IBizOutsourcedOrderDetailProcessService bizOutsourcedOrderDetailProcessService;
+    @Resource
+    private ISysConfigService sysConfigService;
 
     /**
      * 查询报工记录列表
@@ -1323,7 +1327,7 @@ public class BizDayworkItemController extends BaseController {
             }
         }else {
             //查询出当前用户在该工段的所有资源组
-            List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.query().eq("common_id", SecurityUtils.getLoginUser().getUser().getUserId()).in("production_resource_group_id", groupIds).list();
+            List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.query().eq("common_id", SecurityUtils.getLoginUser().getUser().getUserId()).eq("protem_daywork_id", 0L).in("production_resource_group_id", groupIds).list();
             for (BizProductionResourceGroupDetail item : list) {
                 groups.add(item.getProductionResourceGroupId());
             }
@@ -1496,6 +1500,7 @@ public class BizDayworkItemController extends BaseController {
     @Transactional
     @PostMapping("/turnoverOutsource")
     public AjaxResult turnoverOutsource(@RequestBody BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkItem);
         //判断当前是否在盘点
         BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status", 1).one();
         if (bizTakeStockPeriod != null && bizTakeStockPeriod.getStatus() == 1) {
@@ -1504,7 +1509,9 @@ public class BizDayworkItemController extends BaseController {
         // 设置工时
         // 获取箱子关联的所有批次
         boolean batch = true;
-        SysDept sysDept = sysDeptMapper.selectDeptByCode(bizDayworkItem.getDeptCode());
+        SysDept sysDept =new SysDept();
+          sysDept = sysDeptMapper.selectDeptByCodeAndTenantId(bizDayworkItem.getDeptCode(), bizDayworkItem.getTenantId());
+
         bizDayworkItem.setDeptId(sysDept.getDeptId());
         bizDayworkItem.setDeptName(sysDept.getDeptName());
         List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("is_changed", 0).eq("daywork_id", bizDayworkItem.getDayworkId()).list();
@@ -1587,6 +1594,7 @@ public class BizDayworkItemController extends BaseController {
     @Transactional
     @PostMapping("/turnoverOutsourceAssist")
     public AjaxResult turnoverOutsourceAssist(@RequestBody BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkItem);
         //判断当前是否在盘点
         BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status", 1).one();
         if (bizTakeStockPeriod != null && bizTakeStockPeriod.getStatus() == 1) {
@@ -1595,7 +1603,9 @@ public class BizDayworkItemController extends BaseController {
         // 设置工时
         // 获取箱子关联的所有批次
         boolean batch = true;
-        SysDept sysDept = sysDeptMapper.selectDeptByCode(bizDayworkItem.getDeptCode());
+        //切换数据源
+        SysDept sysDept =new SysDept();
+            sysDept = sysDeptMapper.selectDeptByCodeAndTenantId(bizDayworkItem.getDeptCode(), bizDayworkItem.getTenantId());
         bizDayworkItem.setDeptId(sysDept.getDeptId());
         bizDayworkItem.setDeptName(sysDept.getDeptName());
         List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("is_changed", 0).eq("daywork_id", bizDayworkItem.getDayworkId()).list();
@@ -1685,6 +1695,7 @@ public class BizDayworkItemController extends BaseController {
     @Transactional
     @PostMapping("/turnover")
     public AjaxResult turnover(@RequestBody BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkItem);
         //判断当前是否在盘点
         BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status", 1).one();
         if (bizTakeStockPeriod != null && bizTakeStockPeriod.getStatus() == 1) {
@@ -1758,6 +1769,7 @@ public class BizDayworkItemController extends BaseController {
                     examine.setTechnologicalProcessDetailId(lastItem.getTechnologicalProcessDetailId());
                     examine.setProcessId(lastItem.getProcessId());
                     examine.setProcessAlias(bizDayworkItem.getProcess().getProcessAlias());
+                    examine.setTenantId(bizDayworkItem.getTenantId());
                     examine.setStatus(0);
                     needAddList.add(examine);
                 }
@@ -1793,7 +1805,7 @@ public class BizDayworkItemController extends BaseController {
                 bizItem.setSpecialIsFirst(lastItem.getSpecialIsFirst());
                 bizItem.setWorkingHours(0L);
                 bizItem.setDeptId(lastItem.getDeptId());
-                bizItem.setTenantId(lastItem.getTenantId());
+                bizItem.setTenantId(bizDayworkItem.getTenantId());
                 bizItem.setProductionPlanDetailId(lastItem.getProductionPlanDetailId());
                 bizItem.setProductionPlanId(lastItem.getProductionPlanId());
                 bizItem.setProductionPlanDetailSubDetailId(lastItem.getProductionPlanDetailSubDetailId());
@@ -1809,7 +1821,6 @@ public class BizDayworkItemController extends BaseController {
                 bizItem.setTurnoverId(bizDayworkItem.getTurnoverId());
                 bizItem.setTurnoverType(bizDayworkItem.getTurnoverType());
                 bizItem.setTurnoverArea(bizDayworkItem.getTurnoverArea());
-                bizItem.setTenantId(bizDayworkItem.getTenantId());
                 bizItem.setPlaceId(bizDayworkItem.getPlaceId());
                 bizItem.setPlace(bizDayworkItem.getPlace());
                 bizItem.setProcessStepNumber(lastItem.getProcessStepNumber());

src/main/java/cn/ezhizao/project/business/product/controller/BizInspectionChamberController.java

@@ -43,6 +43,7 @@ public class BizInspectionChamberController extends BaseController
     @Log(title = "检查室列表", businessType = BusinessType.INSERT)
     public TableDataInfo list(BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
     {
+        setTenantId(bizInspectionChamber);
         List<BizInspectionChamber> list = bizInspectionChamberService.getList(bizInspectionChamber);
         return getDataTable(list);
     }

src/main/java/cn/ezhizao/project/business/product/controller/BizLotController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
@@ -19,6 +20,8 @@ import cn.ezhizao.project.business.product.service.*;
 import cn.ezhizao.project.business.technologicalProcess.service.IBizTechnologicalProcessService;
 import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
+import cn.ezhizao.project.system.domain.SysDept;
+import cn.ezhizao.project.system.service.ISysConfigService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -58,6 +61,8 @@ public class BizLotController extends BaseController {
     private IBizOutsourcedOrderDetailService bizOutsourcedOrderDetailService;
     @Resource
     private IBizDayworkItemService bizDayworkItemService;
+    @Resource
+    private ISysConfigService sysConfigService;
 
     /**
      * 查询批次号列表
@@ -66,6 +71,7 @@ public class BizLotController extends BaseController {
     @GetMapping("/list")
     @Log(title = "查询批次列表", businessType = BusinessType.INSERT)
     public TableDataInfo list(BizLot bizLot) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizLot);
         List<BizLot> list = bizLotService.getList(bizLot);
         return getDataTable(list);
     }
@@ -101,6 +107,7 @@ public class BizLotController extends BaseController {
     @GetMapping("/getProcessListByLot")
     @Log(title = "查询批次对应工序", businessType = BusinessType.INSERT)
     public AjaxResult getProcessListByLot(BizLot bizLot) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizLot);
             //该批是否废品回用
             if(bizLot.getIsWasteRecycling() == 1 || bizLot.getIsAmend() == 1 ) {
 //                QueryWrapper<BizLotTechnologicalProcess> queryWrapper = new QueryWrapper<>();

src/main/java/cn/ezhizao/project/business/product/controller/BizProcessInspecionController.java

@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.ezhizao.common.utils.SecurityUtils;
@@ -130,6 +131,8 @@ public class BizProcessInspecionController extends BaseController {
     private IBizTechnologicalProcessDetailDrawingService bizTechnologicalProcessDetailDrawingService;
     @Resource
     private IBizProcessService bizProcessService;
+    @Resource
+    private HttpServletRequest request;
 
     final private String processInspectionNoKey = "processInspectionCode";
 
@@ -140,7 +143,7 @@ public class BizProcessInspecionController extends BaseController {
     @GetMapping("/list")
     @Log(title = "查询序检列表", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
-
+        setTenantId(bizProcessInspecion);
         if (bizProcessInspecion.getStartTime() != null) {
             Date startTimeDate = bizProcessInspecion.getStartTime();
             // 使用 SimpleDateFormat 格式化 Date 对象为特定格式的字符串
@@ -165,7 +168,7 @@ public class BizProcessInspecionController extends BaseController {
     @PostMapping("/examineList")
     @Log(title = "查询交检审核列表", businessType = BusinessType.SELECT)
     public TableDataInfo examineList(@RequestBody BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
-
+        setTenantId(bizProcessInspecion);
         if (bizProcessInspecion.getStartTime() != null) {
             Date startTimeDate = bizProcessInspecion.getStartTime();
             // 使用 SimpleDateFormat 格式化 Date 对象为特定格式的字符串
@@ -270,7 +273,9 @@ public class BizProcessInspecionController extends BaseController {
             throw (new RuntimeException("该产品不存在"));
         }
         BizProcess process = bizProcessService.query().eq("id", lot.getProcessId()).one();
-        List<BizTechnologicalProcessDetailDrawing> technologicalProcessDetailDrawingList = bizTechnologicalProcessDetailDrawingService.query().eq("product_id", product.getId()).eq("process_code", process.getProcessCode()).orderByDesc("create_time").list();
+        List<BizTechnologicalProcessDetailDrawing> technologicalProcessDetailDrawingList = bizTechnologicalProcessDetailDrawingService.query().eq("product_id", product.getId()).eq("process_code", process.getProcessCode())
+                .eq("tenant_id",Long.parseLong(request.getHeader("tenantId")))
+                .orderByDesc("create_time").list();
 
         if(!technologicalProcessDetailDrawingList.isEmpty()){
             SysUser user = sysUserService.selectUserById(technologicalProcessDetailDrawingList.get(0).getCreatorId());
@@ -1068,7 +1073,8 @@ public class BizProcessInspecionController extends BaseController {
     @PostMapping("/saveOutsourcedInspecion")
     @Log(title = "新增外协序检信息", businessType = BusinessType.INSERT)
     public AjaxResult saveOutsourcedInspectionV4(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
-//        // 判断是否已有未确认外协检查
+        setTenantId(processInspecion);
+        //        // 判断是否已有未确认外协检查
 //        if (bizProcessInspecionService.query().eq("outsource_order_detail_id", processInspecion.getOutsourceOrderDetailId()).eq("status", 0).count() > 0) {
 //            return error("已有未完成外协检查单。");
 //        }
@@ -1208,6 +1214,7 @@ public class BizProcessInspecionController extends BaseController {
             //inspection.setReviewerId(SecurityUtils.getLoginUser().getUserId());
             inspection.setProcessStepNumber(processInspecion.getProcessStepNumber());
             inspection.setFromId(processInspecion.getId());
+            inspection.setTenantId(processInspecion.getTenantId());
             inspection.setType("instrumentRoomInspection");
             if (inspection.getStartTime() == null) {
                 inspection.setStartTime(new Date());
@@ -1286,6 +1293,7 @@ public class BizProcessInspecionController extends BaseController {
                     reject.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
                     reject.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
                     reject.setLotId(processInspecion.getLot().getId());
+                    reject.setTenantId(processInspecion.getTenantId());
                     reject.setDayworkItemId(dayworkItem.getId());
                     Long rejectNum = reject.getRejectNum() == null ? 0L : reject.getRejectNum();
                     newRej.setRejectNum(rejectNum);
@@ -1299,6 +1307,7 @@ public class BizProcessInspecionController extends BaseController {
                     newRej.setDayworkItemId(dayworkItem.getId());
                     newRej.setReason("外协检查废品");
                     newRej.setDeptId(processInspecion.getDeptId());
+                    newRej.setTenantId(processInspecion.getTenantId());
                 }
             }
             processInspectionDetailService.saveBatch(rejects);
@@ -1309,6 +1318,7 @@ public class BizProcessInspecionController extends BaseController {
                 if (processInspecion.getProcessInspectionPictureList() != null && !processInspecion.getProcessInspectionPictureList().isEmpty()) {
                     processInspecion.getProcessInspectionPictureList().forEach(item -> {
                         item.setProcessInspectionId(processInspecion.getId());
+                        item.setTenantId(processInspecion.getTenantId());
                     });
                 }
                 saveOrUpdateBatch(bizProcessInspectionPictureService, processInspecion.getProcessInspectionPictureList() == null || processInspecion.getProcessInspectionPictureList().isEmpty() ? new ArrayList<>() : processInspecion.getProcessInspectionPictureList(), oldProcessInspectionList);
@@ -1335,6 +1345,7 @@ public class BizProcessInspecionController extends BaseController {
                     consult.setProcessId(dayworkItem.getProcessId());
                     consult.setProcessAlias(processInspecion.getLot().getProcessAlias());
                     consult.setIsOutsourcedInspection(1);
+                    consult.setTenantId(processInspecion.getTenantId());
                     //consult.setTechnicianId(technicianUser == null ? 0L : technicianUser.getUserId());
                 }
                 bizDayworkItemConsultService.saveOrUpdateBatch(consults);
@@ -1519,6 +1530,7 @@ public class BizProcessInspecionController extends BaseController {
     @PostMapping("/saveOnSiteInspection")
     @Log(title = "新增巡检信息", businessType = BusinessType.INSERT)
     public AjaxResult saveOnSiteInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(processInspecion);
         if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
             throw new RuntimeException("检测载具已解绑，移交仪器室，请绑定载具");
         }
@@ -1618,6 +1630,7 @@ public class BizProcessInspecionController extends BaseController {
             //inspection.setReviewerId(SecurityUtils.getLoginUser().getUserId());
             inspection.setProcessStepNumber(processInspecion.getProcessStepNumber());
             inspection.setFromId(processInspecion.getId());
+            inspection.setTenantId(processInspecion.getTenantId());
             inspection.setType("instrumentRoomInspection");
             if (inspection.getStartTime() == null) {
                 inspection.setStartTime(new Date());
@@ -1691,6 +1704,7 @@ public class BizProcessInspecionController extends BaseController {
                 reject.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
                 reject.setLotId(processInspecion.getLot().getId());
                 reject.setDayworkItemId(dayworkItem.getId());
+                reject.setTenantId(processInspecion.getTenantId());
             }
         }
         processInspectionDetailService.saveBatch(rejects);
@@ -1699,6 +1713,7 @@ public class BizProcessInspecionController extends BaseController {
         if (processInspecion.getProcessInspectionPictureList() != null && !processInspecion.getProcessInspectionPictureList().isEmpty()) {
             processInspecion.getProcessInspectionPictureList().forEach(item -> {
                 item.setProcessInspectionId(processInspecion.getId());
+                item.setTenantId(processInspecion.getTenantId());
             });
         }
         saveOrUpdateBatch(bizProcessInspectionPictureService, processInspecion.getProcessInspectionPictureList() == null || processInspecion.getProcessInspectionPictureList().isEmpty() ? new ArrayList<>() : processInspecion.getProcessInspectionPictureList(), oldProcessInspectionList);
@@ -1751,7 +1766,6 @@ public class BizProcessInspecionController extends BaseController {
 
         //修改daywaork信息
         dayworkItem.setIsProcessInspection(1);
-        dayworkItem.setTenantId(processInspecion.getTenantId());
         if(dayworkItem.getDeleted() == 1) {
             return success();
         }
@@ -1762,6 +1776,7 @@ public class BizProcessInspecionController extends BaseController {
     @PostMapping("/saveFirstInspection")
     @Log(title = "新增首序检信息", businessType = BusinessType.INSERT)
     public AjaxResult saveFirstInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(processInspecion);
         if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
             throw new RuntimeException("检测载具已解绑，移交仪器室，请绑定载具");
         }
@@ -1944,6 +1959,7 @@ public class BizProcessInspecionController extends BaseController {
         if (processInspecion.getProcessInspectionPictureList() != null && !processInspecion.getProcessInspectionPictureList().isEmpty()) {
             processInspecion.getProcessInspectionPictureList().forEach(item -> {
                 item.setProcessInspectionId(processInspecion.getId());
+                item.setTenantId(processInspecion.getTenantId());
             });
         }
         saveOrUpdateBatch(bizProcessInspectionPictureService, processInspecion.getProcessInspectionPictureList() == null || processInspecion.getProcessInspectionPictureList().isEmpty() ? new ArrayList<>() : processInspecion.getProcessInspectionPictureList(), oldProcessInspectionList);
@@ -2157,6 +2173,7 @@ public class BizProcessInspecionController extends BaseController {
     @PostMapping("/saveDeliveryInspection")
     @Log(title = "新增交检信息", businessType = BusinessType.INSERT)
     public AjaxResult saveDeliveryInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
+       setTenantId(processInspecion);
         if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
             throw new RuntimeException("检测载具已解绑，移交仪器室，请绑定载具");
         }
@@ -2288,7 +2305,6 @@ public class BizProcessInspecionController extends BaseController {
             newDayworkCarrier.setDayworkId(inspection.getDayworkId());
             newDayworkCarrier.setCarrierCode(inspection.getInspectionCarrierCode());
             newDayworkCarrier.setCarrierId(inspection.getInspectionCarrierId());
-            newDayworkCarrier.setTenantId(inspection.getTenantId());
             newDayworkCarrier.setLotCode(inspection.getLotCode());
             newDayworkCarrier.setLotId(inspection.getLotId());
             newDayworkCarrier.setProductionPlanDetailId(inspection.getProductionPlanDetailId());
@@ -2325,6 +2341,7 @@ public class BizProcessInspecionController extends BaseController {
                 reject.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
                 reject.setLotId(processInspecion.getLot().getId());
                 reject.setDayworkItemId(dayworkItem.getId());
+                reject.setTenantId(processInspecion.getTenantId());
             }
         }
         processInspectionDetailService.saveBatch(rejects);
@@ -2333,6 +2350,7 @@ public class BizProcessInspecionController extends BaseController {
         if (processInspecion.getProcessInspectionPictureList() != null && !processInspecion.getProcessInspectionPictureList().isEmpty()) {
             processInspecion.getProcessInspectionPictureList().forEach(item -> {
                 item.setProcessInspectionId(processInspecion.getId());
+                item.setTenantId(processInspecion.getTenantId());
             });
         }
         saveOrUpdateBatch(bizProcessInspectionPictureService, processInspecion.getProcessInspectionPictureList() == null || processInspecion.getProcessInspectionPictureList().isEmpty() ? new ArrayList<>() : processInspecion.getProcessInspectionPictureList(), oldProcessInspectionList);
@@ -2378,6 +2396,7 @@ public class BizProcessInspecionController extends BaseController {
                     consultPicture.setPictureName(info.getPictureName());
                     consultPicture.setTenantId(processInspecion.getTenantId());
                     consultPicture.setUrl(info.getUrl());
+                    consultPicture.setTenantId(processInspecion.getTenantId());
                     pictures.add(consultPicture);
                 });
             });
@@ -2386,7 +2405,6 @@ public class BizProcessInspecionController extends BaseController {
 
         //修改daywaork信息
         dayworkItem.setIsProcessInspection(1);
-        dayworkItem.setTenantId(processInspecion.getTenantId());
         if(dayworkItem.getDeleted() == 1) {
             return success();
         }
@@ -2415,6 +2433,7 @@ public class BizProcessInspecionController extends BaseController {
     @PostMapping("/saveInstrumentRoomInspection")
     @Log(title = "新增仪器室检查", businessType = BusinessType.INSERT)
     public AjaxResult saveInstrumentRoomInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(processInspecion);
         //根据lot信息保存序检表
         BizDaywork daywork = bizDayworkService.query().eq("lot_code", processInspecion.getLot().getLotCode()).one();
         BizProduct product = bizProductService.getById(processInspecion.getLot().getProductId());
@@ -2501,6 +2520,7 @@ public class BizProcessInspecionController extends BaseController {
         if (processInspecion.getProcessInspectionPictureList() != null && !processInspecion.getProcessInspectionPictureList().isEmpty()) {
             processInspecion.getProcessInspectionPictureList().forEach(item -> {
                 item.setProcessInspectionId(processInspecion.getId());
+                item.setTenantId(processInspecion.getTenantId());
             });
         }
         saveOrUpdateBatch(bizProcessInspectionPictureService, processInspecion.getProcessInspectionPictureList() == null || processInspecion.getProcessInspectionPictureList().isEmpty() ? new ArrayList<>() : processInspecion.getProcessInspectionPictureList(), oldProcessInspectionList);
@@ -2566,6 +2586,7 @@ public class BizProcessInspecionController extends BaseController {
     @PostMapping("/saveFirstInstrumentRoomInspection")
     @Log(title = "新增首序送检仪器室", businessType = BusinessType.INSERT)
     public AjaxResult saveFirstInstrumentRoomInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(processInspecion);
         if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
             throw new RuntimeException("检测载具已解绑，移交仪器室，请绑定载具");
         }
@@ -2650,7 +2671,8 @@ public class BizProcessInspecionController extends BaseController {
             List<BizInspectionStandardsCheck> inspectionStandardsCheckList = bizInspectionStandardsCheckService.query()
                     .eq("inspection_code", "instrumentRoomInspection")
                     .eq("product_id", processInspecion.getProductId())
-                    .eq("process_id", processInspecion.getLot().getProcessId()).list();
+                    .eq("process_id", processInspecion.getLot().getProcessId())
+                    .eq("tenant_id", processInspecion.getTenantId()).list();
             List<BizProcessInspectionDetail> detailList = new ArrayList<>();
             inspectionStandardsCheckList.forEach(inspectionStandardsCheck -> {
                 BizProcessInspectionDetail detail = new BizProcessInspectionDetail();
@@ -2675,12 +2697,12 @@ public class BizProcessInspecionController extends BaseController {
         if (processInspecion.getProcessInspectionPictureList() != null && !processInspecion.getProcessInspectionPictureList().isEmpty()) {
             processInspecion.getProcessInspectionPictureList().forEach(item -> {
                 item.setProcessInspectionId(processInspecion.getId());
+                item.setTenantId(processInspecion.getTenantId());
             });
         }
         saveOrUpdateBatch(bizProcessInspectionPictureService, processInspecion.getProcessInspectionPictureList() == null || processInspecion.getProcessInspectionPictureList().isEmpty() ? new ArrayList<>() : processInspecion.getProcessInspectionPictureList(), oldProcessInspectionList);
         //修改daywaork信息
         dayworkItem.setIsProcessInspection(1);
-        dayworkItem.setTenantId(processInspecion.getTenantId());
         if(dayworkItem.getDeleted() == 1) {
             return success();
         }
@@ -2692,6 +2714,7 @@ public class BizProcessInspecionController extends BaseController {
     @PostMapping("/saveFactoryInspection")
     @Log(title = "出厂检人员新增出厂检", businessType = BusinessType.INSERT)
     public AjaxResult saveFactoryInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(processInspecion);
         if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
             throw new RuntimeException("检测载具已解绑，移交仪器室，请绑定载具");
         }
@@ -2796,6 +2819,7 @@ public class BizProcessInspecionController extends BaseController {
             //inspection.setReviewerId(SecurityUtils.getLoginUser().getUserId());
             inspection.setProcessStepNumber(processInspecion.getProcessStepNumber());
             inspection.setFromId(processInspecion.getId());
+            inspection.setTenantId(processInspecion.getTenantId());
             inspection.setType("instrumentRoomInspection");
             if (inspection.getStartTime() == null) {
                 inspection.setStartTime(new Date());
@@ -2855,6 +2879,7 @@ public class BizProcessInspecionController extends BaseController {
         if (processInspecion.getProcessInspectionPictureList() != null && !processInspecion.getProcessInspectionPictureList().isEmpty()) {
             processInspecion.getProcessInspectionPictureList().forEach(item -> {
                 item.setProcessInspectionId(processInspecion.getId());
+                item.setTenantId(processInspecion.getTenantId());
             });
         }
         saveOrUpdateBatch(bizProcessInspectionPictureService, processInspecion.getProcessInspectionPictureList() == null || processInspecion.getProcessInspectionPictureList().isEmpty() ? new ArrayList<>() : processInspecion.getProcessInspectionPictureList(), oldProcessInspectionList);
@@ -2909,7 +2934,6 @@ public class BizProcessInspecionController extends BaseController {
         }
         //修改daywaork信息
         dayworkItem.setIsProcessInspection(1);
-        dayworkItem.setTenantId(processInspecion.getTenantId());
         if(dayworkItem.getDeleted() == 1) {
             return success();
         }
@@ -2993,7 +3017,6 @@ public class BizProcessInspecionController extends BaseController {
         }
         //修改daywaork信息
         dayworkItem.setIsProcessInspection(1);
-        dayworkItem.setTenantId(processInspecion.getTenantId());
         if(dayworkItem.getDeleted() == 1) {
             return success();
         }
@@ -4034,9 +4057,10 @@ public class BizProcessInspecionController extends BaseController {
     @Log(title = "保存外协检查单与关联检查单")
     @PostMapping("/saveOutsourceInspectionWithRelate")
     @Transactional
-    public AjaxResult saveOutsourceInspectionWithRelate(@RequestBody BizProcessInspecion processInspecion) {
+    public AjaxResult saveOutsourceInspectionWithRelate(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
         Map<String, Object> map = getRelationInspection(processInspecion);
         BizProcessInspecion bizProcessInspecion = (BizProcessInspecion) map.get("master");
+        setTenantId(bizProcessInspecion);
         List<BizProcessInspecion> relateList = (List<BizProcessInspecion>) map.get("detail");
         // 保存主检测单信息
         saveMasterInspection(bizProcessInspecion);
@@ -4064,7 +4088,7 @@ public class BizProcessInspecionController extends BaseController {
                     consult.setDayworkId(item == null ? 0 : item.getDayworkId());
                 }
                 consult.setUserId(user == null ? 0L : user.getUserId());
-                consult.setTenantId(processInspecion.getTenantId());
+                consult.setTenantId(bizProcessInspecion.getTenantId());
                 consult.setNickName(user == null ? "" : user.getNickName());
                 consult.setProcessInspectionId(processInspecion.getId());
 //                consult.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
@@ -4089,7 +4113,7 @@ public class BizProcessInspecionController extends BaseController {
                 consultPicture.setDayworkItemConsultId(ne.getId());
                 consultPicture.setPictureName(info.getPictureName());
                 consultPicture.setUrl(info.getUrl());
-                consultPicture.setTenantId(processInspecion.getTenantId());
+                consultPicture.setTenantId(bizProcessInspecion.getTenantId());
                 pictures.add(consultPicture);
             });
             }
@@ -4114,7 +4138,7 @@ public class BizProcessInspecionController extends BaseController {
                 for (BizProcessInspectionDetail reject : rejects) {
                     reject.setId(null);
                     reject.setUserId(user == null ? 0L : user.getUserId());
-                    reject.setTenantId(processInspecion.getTenantId());
+                    reject.setTenantId(bizProcessInspecion.getTenantId());
                     reject.setProcessInspectionId(processInspecion.getId());
                     reject.setDayworkId(0L);
                     reject.setLotId(processInspecion.getLot().getId());
@@ -4122,7 +4146,7 @@ public class BizProcessInspecionController extends BaseController {
                     newRej.setRejectNum(rejectNum);
                     newRej.setUserId(user == null ? 0L : user.getUserId());
                     newRej.setProcessInspectionId(processInspecion.getId());
-                    newRej.setTenantId(processInspecion.getTenantId());
+                    newRej.setTenantId(bizProcessInspecion.getTenantId());
                     newRej.setDayworkId(0L);
                     newRej.setLotId(processInspecion.getLot().getId());
                     newRej.setReason("外协检查废品");
@@ -4157,6 +4181,7 @@ public class BizProcessInspecionController extends BaseController {
             if (processInspecion.getProcessInspectionPictureList() != null && !processInspecion.getProcessInspectionPictureList().isEmpty()) {
                 processInspecion.getProcessInspectionPictureList().forEach(item -> {
                     item.setProcessInspectionId(processInspecion.getId());
+                    item.setTenantId(bizProcessInspecion.getTenantId());
                 });
             }
             saveOrUpdateBatch(bizProcessInspectionPictureService, processInspecion.getProcessInspectionPictureList() == null || processInspecion.getProcessInspectionPictureList().isEmpty() ? new ArrayList<>() : processInspecion.getProcessInspectionPictureList(), oldProcessInspectionList);
@@ -4169,14 +4194,14 @@ public class BizProcessInspecionController extends BaseController {
                 BizProcessInspectionRelation relation = new BizProcessInspectionRelation();
                 relation.setLotId(processInspecion.getLotId());
                 relation.setProcessInspectionId(processInspecion.getId());
-                relation.setTenantId(processInspecion.getTenantId());
+                relation.setTenantId(bizProcessInspecion.getTenantId());
                 bizProcessInspectionRelationService.save(relation);
                 List<BizProcessInspectionRelationDetail> relatedDetails = new ArrayList<>();
                 relateList.forEach(l -> {
                     BizProcessInspectionRelationDetail item = new BizProcessInspectionRelationDetail();
                     item.setProcessInspectionId(l.getId());
                     item.setLotId(l.getLotId());
-                    item.setTenantId(processInspecion.getTenantId());
+                    item.setTenantId(bizProcessInspecion.getTenantId());
                     item.setProcessInspectionRelationId(relation.getId());
                     relatedDetails.add(item);
                     l.setRelatedId(relation.getId());
@@ -4185,7 +4210,7 @@ public class BizProcessInspecionController extends BaseController {
                 master.setProcessInspectionId(processInspecion.getId());
                 master.setLotId(processInspecion.getLotId());
                 master.setProcessInspectionRelationId(relation.getId());
-                master.setTenantId(processInspecion.getTenantId());
+                master.setTenantId(bizProcessInspecion.getTenantId());
                 master.setIsMaster(1);
                 relatedDetails.add(master);
                 bizProcessInspectionRelationDetailService.saveBatch(relatedDetails);
@@ -4207,6 +4232,7 @@ public class BizProcessInspecionController extends BaseController {
                     BizProcessInspectionRelationDetail item = new BizProcessInspectionRelationDetail();
                     item.setProcessInspectionId(l.getId());
                     item.setLotId(l.getLotId());
+                    item.setTenantId(bizProcessInspecion.getTenantId());
                     item.setProcessInspectionRelationId(processInspecion.getRelatedId());
                     add.add(item);
                 }
@@ -4253,7 +4279,7 @@ public class BizProcessInspecionController extends BaseController {
         return map;
     }
 
-    public boolean saveMasterInspection(BizProcessInspecion processInspecion) {
+    public boolean saveMasterInspection(BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
         BizDaywork daywork = bizDayworkService.query().eq("lot_code", processInspecion.getLot().getLotCode()).one();
         BizDayworkItem dayworkItem = bizDayworkItemService.selById(processInspecion.getDayworkItemId());
 //        BizDayworkItem dayworkItem = bizDayworkItemService.getById(processInspecion.getDayworkItemId());
@@ -4387,7 +4413,6 @@ public class BizProcessInspecionController extends BaseController {
             //绑定检测载具
             BizDayworkCarrier newDayworkCarrier = new BizDayworkCarrier();
             newDayworkCarrier.setDayworkId(inspection.getDayworkId());
-            newDayworkCarrier.setTenantId(processInspecion.getTenantId());
             newDayworkCarrier.setCarrierCode(inspection.getInspectionCarrierCode());
             newDayworkCarrier.setCarrierId(inspection.getInspectionCarrierId());
             newDayworkCarrier.setLotCode(inspection.getLotCode());
@@ -4412,7 +4437,6 @@ public class BizProcessInspecionController extends BaseController {
             }
         }
         //修改daywaork信息
-        dayworkItem.setTenantId(processInspecion.getTenantId());
         dayworkItem.setIsProcessInspection(1);
         if (dayworkItem.getDeleted() == 1) {
             return true;

src/main/java/cn/ezhizao/project/business/product/controller/BizProductionPlanDetailController.java

@@ -22,6 +22,7 @@ import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceG
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupService;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupSubPlanService;
 import cn.ezhizao.project.system.domain.SysDept;
+import cn.ezhizao.project.system.service.ISysConfigService;
 import cn.ezhizao.project.system.service.ISysDeptService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/cn/ezhizao/project/business/product/controller/BizQuickDayworkController.java

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
@@ -80,6 +81,8 @@ public class BizQuickDayworkController extends BaseController {
     private IBizTurnoverService bizTurnoverService;
     @Resource
     private IBizDayworkItemExamineService bizDayworkItemExamineService;
+    @Resource
+    HttpServletRequest request;
 
 //    @Resource
 //    SnowflakeIdWorker snowflakeIdWorker;
@@ -407,6 +410,7 @@ public class BizQuickDayworkController extends BaseController {
     @PostMapping("/getDayworkByCarrierCode")
     @Log(title = "快速报工扫码载具", businessType = BusinessType.SELECT)
     public AjaxResult getDayworkByCarrierCode(@RequestBody BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
+        long tenantId = Long.parseLong(request.getHeader("tenantId"));
         // 获取快速报工的所有工段
         SysDept dept = deptService.selectDeptById(bizDayworkItem.getDeptId());
         List<BizDeptProcess> processes = deptProcessService.query().eq("dept_id", dept.getDeptId()).list();

src/main/java/cn/ezhizao/project/business/product/controller/SortDayworkController.java

@@ -191,6 +191,7 @@ public class SortDayworkController extends BaseController {
                 .eq("technology_version", bizLot.getTechnologyVersion())
                 .eq("process_code", bizDayworkItem.getProcessCode())
                 .eq("type", 1)
+                .eq("tenant_id", bizDayworkItem.getTenantId())
                 .list();
         List<BizInspectionInstruction> inspectionInstructions = new ArrayList<>();
         list.forEach(item->{
@@ -224,7 +225,7 @@ public class SortDayworkController extends BaseController {
         List<BizInspectionCategory> list = bizInspectionCategoryService.query().eq("tenant_id", bizInspectionInstruction.getTenantId()).eq("type", 1).list();
         if(!list.isEmpty()){
             List<Long> categoryIds = list.stream().map(BizInspectionCategory::getId).collect(Collectors.toList());
-            List<BizInspectionInstruction> inspectionInstructionList = bizInspectionInstructionService.query().in("category_id", categoryIds).list();
+            List<BizInspectionInstruction> inspectionInstructionList = bizInspectionInstructionService.query().in("category_id", categoryIds).eq("tenant_id", bizInspectionInstruction.getTenantId()).list();
             if(!inspectionInstructionList.isEmpty()){
                 inspectionInstructionList.forEach(item->{
                     item.setType(1);
@@ -256,6 +257,7 @@ public class SortDayworkController extends BaseController {
                     consultPicture.setDayworkItemConsultId(needAdd.get(i).getId());
                     consultPicture.setPictureName(bizDayworkItemConsult.getPictures().get(j).getPictureName());
                     consultPicture.setUrl(bizDayworkItemConsult.getPictures().get(j).getUrl());
+                    consultPicture.setTenantId(bizDayworkItemConsult.getTenantId());
                     pictures.add(consultPicture);
                 }
             }

src/main/java/cn/ezhizao/project/business/switchDept/controller/SwitchController.java

@@ -180,8 +180,7 @@ public class SwitchController extends BaseController {
 
     @GetMapping("/listAllDepts")
     @Log(title = "获取所有工段列表", businessType = BusinessType.SELECT)
-    public AjaxResult listAllDepts() {
-        SysDept sysDept = new SysDept();
+    public AjaxResult listAllDepts(SysDept sysDept) {
         sysDept.setIsWorkSection(1);
         List<SysDept> depts = sysDeptService.selectDeptList(sysDept);
         return success(depts);

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -57,7 +57,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     @Log(title = "获取电子图纸列表", businessType = BusinessType.SELECT)
     public AjaxResult list(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     {
-//        setTenantId(bizTechnologicalProcessDetailDrawing);
+        setTenantId(bizTechnologicalProcessDetailDrawing);
 //        startPage();
         List<BizTechnologicalProcessDetailDrawing> list = bizTechnologicalProcessDetailDrawingService.getList(bizTechnologicalProcessDetailDrawing);
         return success(list);

src/main/java/cn/ezhizao/project/business/turnover/controller/BizTurnoverController.java

@@ -1,11 +1,13 @@
 package cn.ezhizao.project.business.turnover.controller;
 
+import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.project.business.turnover.domain.BizTurnover;
 import cn.ezhizao.project.business.turnover.service.IBizTurnoverService;
+import cn.ezhizao.project.system.service.ISysConfigService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +30,8 @@ public class BizTurnoverController extends BaseController {
     private IBizTurnoverService iBizTurnoverService;
     @Resource
     HttpServletRequest request;
+    @Resource
+    private ISysConfigService sysConfigService;
 
     /**
      * 查询周转区列表
@@ -37,7 +41,7 @@ public class BizTurnoverController extends BaseController {
     @PostMapping("/list")
     public AjaxResult list(@RequestBody Map<String, Object> data) throws NoSuchFieldException, IllegalAccessException {
         Integer zero = 0;
-        String tenantId = request.getHeader("tenantId");
+        String tenantId =data.get("tenantId").toString();
         QueryWrapper<BizTurnover> queryWrapper = new QueryWrapper<>();
         final String param1 = "deptId";
         long deptId = 0L;
@@ -47,6 +51,7 @@ public class BizTurnoverController extends BaseController {
 
         queryWrapper.eq("dept_id", deptId);
         queryWrapper.eq("status",0);
+
         if (tenantId != null && !zero.toString().equals(tenantId)) {
             queryWrapper.eq("tenant_id", Long.valueOf(tenantId));
         }

src/main/java/cn/ezhizao/project/business/workshop/controller/BizWorkshopController.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.workshop.controller;
 
+import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
@@ -14,12 +15,16 @@ import cn.ezhizao.project.business.workshop.service.IBizWorkshopService;
 import cn.ezhizao.project.business.workshop.service.IBizWorkshopTurnoverService;
 import cn.ezhizao.project.system.domain.SysDept;
 import cn.ezhizao.project.system.mapper.SysDeptMapper;
+import cn.ezhizao.project.system.service.ISysConfigService;
 import cn.ezhizao.project.system.service.ISysDeptService;
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -43,7 +48,10 @@ public class BizWorkshopController extends BaseController {
     private IBizWorkshopService bizWorkshopService;
     @Resource
     private SysDeptMapper sysDeptMapper;
-
+    @Resource
+    private ISysConfigService sysConfigService;
+    @Resource
+    private HttpServletRequest request;
     /**
      * 查询周转区列表
      */
@@ -52,11 +60,14 @@ public class BizWorkshopController extends BaseController {
     @PostMapping("/turnover")
     public AjaxResult turnover(@RequestBody Map<String, Object> data) throws NoSuchFieldException, IllegalAccessException {
         long deptId = Long.parseLong(data.get("deptId").toString());
+        long tenantId = Long.parseLong(request.getHeader("tenantId"));
         SysDept dept = iSysDeptService.selectDeptById(deptId);
-        List<BizWorkshopTurnover> workshopTurnovers = iBizWorkshopTurnoverService.query()
-                .eq("workshop_id", dept.getWorkshopId())
-                .eq("status",0)
-                .list();
+        List<BizWorkshopTurnover> workshopTurnovers = new ArrayList<>();
+          workshopTurnovers = iBizWorkshopTurnoverService.query()
+                    .eq("workshop_id", dept.getWorkshopId())
+                    .eq("status",0)
+                    .eq("tenant_id",tenantId)
+                    .list();
 
         return success(workshopTurnovers);
     }

src/main/java/cn/ezhizao/project/system/controller/SysDeptController.java

@@ -74,6 +74,7 @@ public class SysDeptController extends BaseController
     //周转工段选择
     @GetMapping("/getDeptListInfo")
     public AjaxResult getDeptListInfo(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(dept);
         //判断该批是否是废品回用
         List<SysDept> departments = new ArrayList<>();
         if(dept.getIsAmend() == 1 ||dept.getIsWasteRecycling() == 1) {

src/main/java/cn/ezhizao/project/system/mapper/SysDeptMapper.java

@@ -50,6 +50,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
     public SysDept selectDeptById(Long deptId);
 
     public SysDept selectDeptByCode(String deptCode);
+    public SysDept selectDeptByCodeAndTenantId(String deptCode, Long tenantId);
 
     /**
      * 根据ID查询所有子部门

src/main/resources/mybatis/business/BizInspectionStandards/BizInspectionStandardsMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="standard != null"> AND t1.standard like concat('%',#{standard},'%')</if>
             <if test="productId != null"> AND t1.product_id = #{productId}</if>
             <if test="processId != null"> AND t1.process_id = #{processId}</if>
+            <if test="tenantId != null"> AND t1.tenant_id = #{tenantId}</if>
         </trim>
     </select>
 

src/main/resources/mybatis/business/BizInspectionStandardsCheck/BizInspectionStandardsCheckMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             <if test="instrument != null  and instrument != ''"> AND instrument = #{instrument}</if>
+            <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
             <if test="productVersion != null  and productVersion != ''"> AND product_version = #{productVersion}</if>
             <if test="processCode != null  and processCode != ''"> AND process_code = #{processCode}</if>
             <if test="standard != null  and standard != ''"> AND standard = #{standard}</if>

src/main/resources/mybatis/business/auxiliaryDaywork/BizDayworkAuxiliaryItemMapper.xml

@@ -161,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             <if test="id != null"> AND t1.id = #{id}</if>
+            <if test="tenantId != null and tenantId != 0"> AND t1.tenant_id = #{tenantId}</if>
             <if test="deptName != null  and deptName != ''"> AND t1.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> AND t1.user_id = #{userId}</if>
             <if test="status != null  and status != ''"> AND t1.status = #{status}</if>

src/main/resources/mybatis/business/product/BizInspectionChamberMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             deleted = 0
             <if test="chamberName != null  and chamberName != ''"> AND chamber_name like concat('%', #{chamberName}, '%')</if>
             <if test="chamberCode != null  and chamberCode != ''"> AND chamber_code = #{chamberCode}</if>
+            <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
             <if test="id != null  and id != 0"> AND id != #{id}</if>
         </trim>
     </select>

src/main/resources/mybatis/business/product/BizLotMapper.xml

@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             deleted = 0
             AND id NOT IN(select lot_id from biz_daywork where biz_daywork.deleted = 0) and is_waste_recycling = 0 and is_amend=0
             <if test="id != null and id != ''"> AND id = #{id}</if>
+            <if test="tenantId != null and tenantId != 0"> AND tenant_id = #{tenantId}</if>
             <if test="lotCode != null  and lotCode != ''"> AND lot_code = #{lotCode}</if>
             <if test="productionPlanDetailId != null and productionPlanDetailId!=''"> AND production_plan_detail_id = #{productionPlanDetailId}</if>
             <if test="productCode != null  and productCode != ''"> AND product_code = #{productCode}</if>
@@ -63,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             production_plan_detail_id = #{productionPlanDetailId}
             and (is_waste_recycling = 1 or is_amend = 1) and deleted = 0
             <if test="flag != null and flag != ''"> AND id NOT IN(select lot_id from biz_daywork where biz_daywork.deleted = 0)</if>
+            <if test="tenantId != null and tenantId != 0"> AND tenant_id = #{tenantId}</if>
         </trim>
     </select>
 

src/main/resources/mybatis/business/product/BizProcessInspecionMapper.xml

@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND t1.return_receipt_detail_id =0
             <if test="lotCode != null  and lotCode != ''">AND t1.lot_code = #{lotCode}</if>
             <if test="userId != null  ">AND t1.user_id = #{userId}</if>
+            <if test="tenantId != null  ">AND t1.tenant_id = #{tenantId}</if>
             <if test="deptId != null  ">AND t1.dept_id = #{deptId}</if>
             <if test="creatorId != null  ">AND t1.creator_id = #{creatorId}</if>
             <if test="startTimeString != null and startTimeString!=''">AND t1.create_time &gt;= #{startTimeString}</if>
@@ -103,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTimeString != null and startTimeString!=''">AND t1.create_time &gt;= #{startTimeString}</if>
             <if test="endTimeString != null and endTimeString!='' ">AND t1.create_time &lt;= #{endTimeString}</if>
             <if test="type != null  ">AND t1.type = #{type}</if>
+            <if test="tenantId != null  and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
             <if test="keyword != null  and keyword != '' ">AND (t1.lot_code LIKE CONCAT('%',#{keyword},'%') OR carrier_code
                 LIKE CONCAT('%',#{keyword},'%') OR
                 t1.product_description LIKE CONCAT('%',#{keyword},'%')OR inspection_carrier_code LIKE CONCAT('%',#{keyword},'%'))
@@ -118,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND t1.return_receipt_detail_id !=0
             and t1.id not in (select process_inspection_id from biz_process_inspection_relation_detail where deleted = 0 and is_master = 0)
             <if test="lotCode != null  and lotCode != ''">AND t1.lot_code = #{lotCode}</if>
+            <if test="tenantId != null  ">AND t1.tenant_id = #{tenantId}</if>
             <if test="userId != null  ">AND t1.user_id = #{userId}</if>
             <if test="isAuto != null  ">AND t1.is_auto = #{isAuto}</if>
             <if test="startTimeString != null and startTimeString!=''">AND t1.create_time &gt;= #{startTimeString}</if>

src/main/resources/mybatis/business/technologicalProcessDetailDrawing/BizTechnologicalProcessDetailDrawingMapper.xml

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0 and abandoned = 0 and status = 2
             <if test="url != null  and url != ''"> AND url = #{url}</if>
+            <if test="tenantId != null" >AND tenant_id = #{tenantId}</if>
             <if test="productId != null">and product_id = #{productId} </if>
             <if test="productVersion != null and productVersion !=''">AND product_version = #{productVersion}</if>
             <if test="processCode != null and processCode != ''">AND process_code = #{processCode}</if>

src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -78,7 +78,11 @@
 		</if>
 		order by d.parent_id, d.order_num
 	</select>
-
+	<select id="selectDeptByCodeAndTenantId" resultMap="SysDeptResult">
+		select *
+		from sys_dept d
+		where d.dept_code= #{deptCode} and d.tenant_id = #{tenantId}
+	</select>
 
 
 	<select id="selectDeptByCode" resultMap="SysDeptResult">

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -116,6 +116,9 @@
 		<if test="nickName != null and nickName != ''">
 			AND t1.nick_name like concat('%', #{nickName}, '%')
 		</if>
+		<if test="tenantId != null and tenantId != 0">
+			AND t1.tenant_id = #{tenantId}
+		</if>
 	</select>
 
 	<!-- 员工列表 selectEmployeeList -->