0616

src/main/java/cn/ezhizao/project/business/controller/BizOutsourcedOrderController.java

@@ -1847,6 +1847,7 @@ public class BizOutsourcedOrderController extends BaseController {
     public TableDataInfo getProductionPlan(BizProductionPlanDetail bizProductionPlanDetail) throws NoSuchFieldException, IllegalAccessException {
         SysDept condition = new SysDept();
         condition.setDeptCode("170000");
+        condition.setTenantId(Long.parseLong(request.getHeader("tenant-id")));
         SysDept dept = deptService.getDeptList(condition).stream().findFirst().orElse(null);
         bizProductionPlanDetail.setDeptId(dept != null ? dept.getValue() : null);
         startPage();

src/main/java/cn/ezhizao/project/business/controller/BizPackageResourceGroupController.java

@@ -98,7 +98,6 @@ public class BizPackageResourceGroupController extends BaseController {
         if (!packageResourceGroups.isEmpty()) {
             return error("已有相同的工段号和包装线号请重新输入。");
         }
-        setTenantId(bizPackageResourceGroup);
         return toAjax(bizPackageResourceGroupService.save(bizPackageResourceGroup));
     }
 

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

@@ -116,6 +116,7 @@
 		<if test="deptCode != null and deptCode != ''">
 			AND d.dept_code like concat('%', #{deptCode}, '%')
 		</if>
+		<if test="tenantId != null and tenantId != 0"> and d.tenant_id = #{tenantId} </if>
 		<if test="userId != null">
 			and exists (select 1 from sys_dept_user du where du.dept_id = d.dept_id and du.user_id = #{userId})
 		</if>