0611

src/main/java/cn/ezhizao/project/business/equipment/controller/BizEquipmentDetailController.java

@@ -149,6 +149,7 @@ public class BizEquipmentDetailController extends BaseController {
     public AjaxResult save(@RequestBody BizEquipmentDetail bizEquipmentDetail) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
 //        final String tenantId = request.getHeader("tenantId");
 //        bizEquipmentDetail.setTenantId(Long.valueOf(tenantId));
+        setTenantId(bizEquipmentDetail);
         boolean bool = bizEquipmentDetailService.saveOrUpdate(bizEquipmentDetail);
 //        task.GenerateQcCode(bizEquipmentDetail);
         return bool?success(bizEquipmentDetail):error("操作失败!");

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

@@ -247,7 +247,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     @Log(title = "电子图纸查询", businessType = BusinessType.SELECT)
     @GetMapping("/drawingList")
     public TableDataInfo drawingList(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException {
-//        setTenantId(bizTechnologicalProcessDetailDrawing);
+        setTenantId(bizTechnologicalProcessDetailDrawing);
         startPage();
         List<BizTechnologicalProcessDetailDrawing> list = bizTechnologicalProcessDetailDrawingService.getDrawingList(bizTechnologicalProcessDetailDrawing);
         return getDataTable(list);

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

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