0612

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

@@ -256,11 +256,12 @@ public class BizDayworkController extends BaseController {
     @GetMapping("/listForOutsource")
     @Log(title = "查询外协列表", businessType = BusinessType.SELECT)
     public TableDataInfo listForOutsource(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
-        setTenantId(bizDaywork);
+
         // 已经在页面中存在的daywork id
         List<Long> existingDayworkIds = bizDaywork.getExistingDayworkIds();
         BizDayworkItem dayworkItem = new BizDayworkItem();
         dayworkItem.setDeptCode(bizDaywork.getDeptCode());
+        setTenantId(dayworkItem);
         List<BizDayworkItem> dayworkItemList = bizDayworkService.getItemListForOutsource(dayworkItem);
 
         List<Long> dayworkIds = dayworkItemList.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList());
@@ -271,10 +272,6 @@ public class BizDayworkController extends BaseController {
         }
         bizDaywork.setDayworkIds(dayworkIds);
         startPage();
-        String config = configService.selectConfigByKey("switch_data_source");
-        if ("true".equals(config)) {
-            setTenantId(bizDaywork);
-        }
         List<BizDaywork> dayworkList = bizDayworkService.getListForOutsource(bizDaywork);
         long total = new PageInfo(dayworkList).getTotal();
         //根据查询的daywork信息上发出单查询是否存在
@@ -327,11 +324,13 @@ public class BizDayworkController extends BaseController {
     }
     @GetMapping("/listForInnerOutsource")
     @Log(title = "查询外协列表", businessType = BusinessType.SELECT)
-    public TableDataInfo listForInnerOutsource(BizDaywork bizDaywork) {
+    public TableDataInfo listForInnerOutsource(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
+
         // 已经在页面中存在的daywork id
         List<Long> existingDayworkIds = bizDaywork.getExistingDayworkIds();
         BizDayworkItem dayworkItem = new BizDayworkItem();
         dayworkItem.setDeptCode(bizDaywork.getDeptCode());
+        setTenantId(dayworkItem);
         List<BizDayworkItem> dayworkItemList = bizDayworkService.getItemListForOutsource(dayworkItem);
 
         List<Long> dayworkIds = dayworkItemList.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList());
@@ -412,8 +411,7 @@ public class BizDayworkController extends BaseController {
             return getDataTable(processList);
         }
         dayworkItem.setKeyword(bizDaywork.getKeyword());
-//            setTenantId(dayworkItem);
-        dayworkItem.setTenantId(0L);
+        setTenantId(dayworkItem);
         //根据当前工序查找之后的工序列表
         //是否单批单改或废品回用
 //        startPage();

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 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;
@@ -105,6 +106,8 @@ public class BizLotTechnologicalProcessController extends BaseController {
     private IBizProductionResourceGroupDetailService bizProductionResourceGroupDetailService;
     @Resource
     private IBizNoCurrentRejectService bizNoCurrentRejectService;
+    @Resource
+    private HttpServletRequest request;
 
     // 静态内部类 RequestData
     @Data
@@ -412,7 +415,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
                     amendDetail.setProductShaftCategory(amend.getProductShaftCategory());
                     amendDetail.setProductShaftCategoryName(amend.getProductShaftCategoryName());
                     amendDetail.setProductDescription(amend.getProductDescription());
-                    amendDetail.setTenantId(detail.getTenantId() != null ? detail.getTenantId() : SecurityUtils.getTenantId());
+                    amendDetail.setTenantId(detail.getTenantId() != null ? detail.getTenantId() : Long.parseLong(request.getHeader("tenantId")));
                     amendDetailList.add(amendDetail);
                 }
                 bizLotTechnologicalProcessDetailService.saveBatch(amendDetailList);
@@ -509,7 +512,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
                 amendDetail.setProductShaftCategory(amend.getProductShaftCategory());
                 amendDetail.setProductShaftCategoryName(amend.getProductShaftCategoryName());
                 amendDetail.setProductDescription(amend.getProductDescription());
-                amendDetail.setTenantId(detail.getTenantId() != null ? detail.getTenantId() : SecurityUtils.getTenantId());
+                amendDetail.setTenantId(detail.getTenantId() != null ? detail.getTenantId() : Long.parseLong(request.getHeader("tenantId")));
                 amendDetailList.add(amendDetail);
             }
             bizLotTechnologicalProcessDetailService.saveBatch(amendDetailList);

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

@@ -1010,6 +1010,7 @@ public class BizOutsourcedOrderController extends BaseController {
         List<String> formCodeList = outsourcedOrderDetails.stream().map(BizOutsourcedOrderDetail::getFormCode).collect(Collectors.toList());
         List<BizOutsourcedOrderDetail> newDetaillist = bizOutsourcedOrderDetailService.query().in("form_code", formCodeList).list();
         for (int i = 0; i < newDetaillist.size(); i++) {
+            newDetaillist.get(i).setTenantId(bizOutsourcedOrder.getTenantId());
             for (int j = 0; j < outsourcedOrderDetails.size(); j++) {
                 if (newDetaillist.get(i).getLotId().equals(outsourcedOrderDetails.get(j).getLotId())) {
                     newDetaillist.get(i).setProcesses(outsourcedOrderDetails.get(j).getProcesses());
@@ -1850,10 +1851,7 @@ public class BizOutsourcedOrderController extends BaseController {
         bizProductionPlanDetail.setDeptId(dept != null ? dept.getValue() : null);
         startPage();
         bizProductionPlanDetail.setRemainLot(true);
-        String config = configService.selectConfigByKey("switch_data_source");
-        if ("true".equals(config)) {
             setTenantId(bizProductionPlanDetail);
-        }
         List<BizProductionPlanDetail> list = bizProductionPlanDetailService.getListForOutsource(bizProductionPlanDetail);
         return getDataTable(list);
     }

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

@@ -142,10 +142,7 @@ public class BizOutsourcedOrderDetailController extends BaseController
          2、把已经报工完成的外协明细列出来
          */
         startPage();
-        String config = configService.selectConfigByKey("switch_data_source");
-        if ("true".equals(config)) {
             setTenantId(bizOutsourcedOrderDetail);
-        }
         List<BizOutsourcedOrderDetail> list = bizOutsourcedOrderDetailService.getListForReceipt(bizOutsourcedOrderDetail);
         list.forEach(detail -> {
             // 将字符串拆分转为对象

src/main/java/cn/ezhizao/project/business/domain/BizCompanyProductPackage.java

@@ -194,4 +194,5 @@ public class BizCompanyProductPackage extends BaseEntity
     @Excel(name = "技术员名")
     @ApiModelProperty(value = "技术员名")
     private String jsyna;
+    private Integer isBanned;
 }

src/main/java/cn/ezhizao/project/business/service/impl/BizDayworkItemExamineServiceImpl.java

@@ -78,6 +78,7 @@ public class BizDayworkItemExamineServiceImpl  extends ServiceImpl<BizDayworkIte
                             examine.setTechnologicalProcessDetailId(outsourcedOrderDetail.getTechnologicalProcessDetailId());
                             examine.setProcessId(outsourcedOrderDetail.getProcessId());
                             examine.setProcessAlias(outsourcedOrderDetail.getProcessAlias());
+                            examine.setTenantId(bizOutsourcedOrder.getTenantId());
                             examine.setStatus(0);
                             needAddList.add(examine);
                         }
@@ -96,6 +97,7 @@ public class BizDayworkItemExamineServiceImpl  extends ServiceImpl<BizDayworkIte
                         examine.setTechnologicalProcessDetailId(outsourcedOrderDetail.getTechnologicalProcessDetailId());
                         examine.setProcessId(outsourcedOrderDetail.getProcessId());
                         examine.setProcessAlias(outsourcedOrderDetail.getProcessAlias());
+                        examine.setTenantId(bizOutsourcedOrder.getTenantId());
                         examine.setStatus(0);
                         needAddList.add(examine);
                     }
@@ -117,6 +119,7 @@ public class BizDayworkItemExamineServiceImpl  extends ServiceImpl<BizDayworkIte
                     examine.setTechnologicalProcessDetailId(v.getTechnologicalProcessDetailId());
                     examine.setProcessId(v.getProcessId());
                     examine.setProcessAlias(v.getProcessAlias());
+                    examine.setTenantId(bizOutsourcedOrder.getTenantId());
                     examine.setStatus(0);
                     needAddList.add(examine);
                 });

src/main/java/cn/ezhizao/project/business/service/impl/BizDayworkItemServiceImpl.java

@@ -250,7 +250,7 @@ public class BizDayworkItemServiceImpl extends ServiceImpl<BizDayworkItemMapper,
             newBizDayworkItem.setUserId(SecurityUtils.getLoginUser().getUserId());
             newBizDayworkItem.setNickName(SecurityUtils.getLoginUser().getUser().getNickName());
             newBizDayworkItem.setUserName(SecurityUtils.getLoginUser().getUser().getUserName());
-            newBizDayworkItem.setTenantId(SecurityUtils.getLoginUser().getTenantId());
+            newBizDayworkItem.setTenantId(outsourcedOrder.getTenantId());
             newDayworkItems.add(newBizDayworkItem);
 
 //            //每一道工序新增一条报工信息
@@ -335,7 +335,7 @@ public class BizDayworkItemServiceImpl extends ServiceImpl<BizDayworkItemMapper,
                 newBizDayworkItem.setUserId(SecurityUtils.getLoginUser().getUserId());
                 newBizDayworkItem.setNickName(SecurityUtils.getLoginUser().getUser().getNickName());
                 newBizDayworkItem.setUserName(SecurityUtils.getLoginUser().getUser().getUserName());
-                newBizDayworkItem.setTenantId(SecurityUtils.getLoginUser().getTenantId());
+                newBizDayworkItem.setTenantId(outsourcedOrder.getTenantId());
                 //修改daywork
                 needAddedDayworkItem.add(newBizDayworkItem);
                 BizDaywork daywork = bizDayworkList.stream().filter(item -> item.getId().equals(detail.getDayworkId())).findFirst().orElse(null);

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

@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getList" parameterType="BizCompanyProductPackage" resultMap="BizCompanyProductPackageResult">
         SELECT * FROM biz_company_product_package
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            deleted = 0
+            deleted = 0 and is_banned = 0
             <if test="productId != null "> AND product_id = #{productId}</if>
             <if test="companyId != null "> AND company_id = #{companyId}</if>
             <if test="productCode != null  and productCode != ''"> AND product_code = #{productCode}</if>

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

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * FROM biz_lot_technological_process_detail
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
-            <if test="tenantId != null" > AND tenant_id = #{tenantId}</if>
+            <if test="tenantId != null and tenantId != 0" > AND tenant_id = #{tenantId}</if>
             <if test="technologicalProcessId != null">AND lot_technological_process_id = #{technologicalProcessId}</if>
             <if test="processStepNumber != null  and processStepNumber!=''">AND process_step_number > #{processStepNumber}</if>
             <if test="keyword != null  and keyword != ''">AND (process_key LIKE concat('%', #{keyword}, '%')or

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

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="code != null  and code != ''"> AND code like concat('%',#{code},'%') AND</if>
             <if test="deptId != null  and deptId != ''"> AND dept_id = #{deptId}</if>
             <if test="isDeactivate != null "> AND is_deactivate = #{isDeactivate}</if>
-            <if test="tenantId != null"> AND tenant_id = #{tenantId}</if>
+            <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
         </trim>
     </select>
 

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

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
 			AND date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 		</if>
-		<if test="tenantId != null"><!-- 开始时间检索 -->
+		<if test="tenantId != null and tenantId != 0"><!-- 开始时间检索 -->
 			AND r.tenant_id = #{tenantId}
 		</if>
 		<!-- 数据范围过滤 -->

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

@@ -321,7 +321,7 @@
 		<if test="userName != null and userName != ''">user_name,</if>
 		<if test="nickName != null and nickName != ''">nick_name,</if>
 		<if test="email != null and email != ''">email,</if>
-		<if test="tenantId != null and tenantId != ''">tenant_id,</if>
+		<if test="tenantId != null and tenantId != 0">tenant_id,</if>
 		<if test="avatar != null and avatar != ''">avatar,</if>
 		<if test="phoneNumber != null and phoneNumber != ''">phone_number,</if>
 		<if test="sex != null and sex != ''">sex,</if>
@@ -340,7 +340,7 @@
 		<if test="userName != null and userName != ''">#{userName},</if>
 		<if test="nickName != null and nickName != ''">#{nickName},</if>
 		<if test="email != null and email != ''">#{email},</if>
-		<if test="tenantId != null and tenantId != ''">#{tenantId},</if>
+		<if test="tenantId != null and tenantId != 0">#{tenantId},</if>
 		<if test="avatar != null and avatar != ''">#{avatar},</if>
 		<if test="phoneNumber != null and phoneNumber != ''">#{phoneNumber},</if>
 		<if test="sex != null and sex != ''">#{sex},</if>
@@ -380,7 +380,7 @@
 			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
 			<if test="email != null ">email = #{email},</if>
 			<if test="phoneNumber != null ">phone_number = #{phoneNumber},</if>
-			<if test="tenantId != null ">tenant_id=#{tenantId},</if>
+			<if test="tenantId != null and tenantId != 0 ">tenant_id=#{tenantId},</if>
 			<if test="sex != null and sex != ''">sex = #{sex},</if>
 			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
 			<if test="password != null and password != ''">password = #{password},</if>