0611

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

@@ -57,7 +57,7 @@ public class BizPackageResourceGroupController extends BaseController {
     @GetMapping("/list")
     @Log(title = "查询包装线列表", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizPackageResourceGroup bizPackageResourceGroup) throws NoSuchFieldException, IllegalAccessException {
-//        setTenantId(bizPackageResourceGroup);
+        setTenantId(bizPackageResourceGroup);
 //        startPage();
         List<BizPackageResourceGroup> list = bizPackageResourceGroupService.getList(bizPackageResourceGroup);
         return getDataTable(list);

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

@@ -219,6 +219,10 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
             QueryWrapper<SysDeptUser> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("user_id", userId);
             queryWrapper.eq("deleted", 0);
+            long tenantId = Long.parseLong(request.getHeader("tenantId"));
+            if(tenantId!= 0) {
+                queryWrapper.eq("tenant_id", tenantId);
+            }
             List<SysDeptUser> deptUserList = deptUserService.list(queryWrapper);
             if (deptUserList.size() > 0) {
                 for (SysDeptUser item : deptUserList) {
@@ -268,6 +272,10 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
             QueryWrapper<SysDeptUser> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("user_id", userId);
             queryWrapper.eq("deleted", 0);
+            long tenantId = Long.parseLong(request.getHeader("tenantId"));
+            if(tenantId!= 0L) {
+                queryWrapper.eq("tenant_id", tenantId);
+            }
             List<SysDeptUser> deptUserList = deptUserService.list(queryWrapper);
             if (deptUserList.size() > 0) {
                 for (SysDeptUser item : deptUserList) {

src/main/resources/mybatis/business/BizPackageResourceGroupMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             <if test="packageLineNo != null "> AND t1.package_line_no = #{packageLineNo}</if>
+            <if test="tenantId != null and tenantId != 0"> AND t1.tenant_id = #{tenantId}</if>
             <if test="deptNo != null "> AND t1.dept_no = #{deptNo}</if>
             <if test="deptId != null and deptId != -1 and deptId != '' "> AND t1.dept_id = #{deptId}</if>
             <if test="name != null  and name != ''"> AND t1.name like concat('%', #{name}, '%')</if>

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

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t.deleted = 0 and t.recheck_date is null and t.status = 1 and t.is_outsourced_inspection = 1 and rrd.deleted = 0 and oo.deleted = 0
             and not exists (select 1 from biz_outsourced_order oo left join biz_outsourced_order_detail od on od.master_id = oo.id left join biz_process_inspecion pi on pi.outsource_order_detail_id = od.id  where oo.id = t.outsource_order_id and oo.settlement_type = 2 and pi.recheck_date is null and (pi.id is null or pi.status != 1) and pi.deleted = 0 and od.deleted = 0)
             <if test="lotCode != null  and lotCode != ''">AND t.lot_code like concat ('%',#{lotCode},'%')</if>
-            <if test="tenantId != null and tenant != 0"> AND t.tenant_id = #{tenantId} </if>
+            <if test="tenantId != null and tenantId != 0"> AND t.tenant_id = #{tenantId} </if>
             <if test="userId != null  ">AND t.user_id = #{userId}</if>
             <if test="status != null ">AND t.status = #{status}</if>
             <if test="startTime != null"> AND DATE(t.start_time) &gt;= #{startTime}</if>