guoyujia 2 天之前
父節點
當前提交
e1c00a1f8c

+ 2 - 1
src/main/java/cn/ezhizao/project/business/controller/BizDayworkController.java

@@ -235,7 +235,8 @@ public class BizDayworkController extends BaseController {
 
     @GetMapping("/listDayworkLot")
     @Log(title = "查询报工批次", businessType = BusinessType.SELECT)
-    public TableDataInfo listDayworkLot(BizDaywork bizDaywork) {
+    public TableDataInfo listDayworkLot(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDaywork);
         startPage();
         List<BizDaywork> dayworkList = bizDayworkService.getListFromNoCurrent(bizDaywork);
         if (dayworkList.size() == 0) {

+ 1 - 0
src/main/resources/mybatis/business/BizDayworkMapper.xml

@@ -464,6 +464,7 @@
                 AND (t4.product_description LIKE CONCAT('%', #{keyword}, '%') OR t1.lot_code LIKE CONCAT('%',
                 #{keyword}, '%'))
             </if>
+            <if test="tenantId != null and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
         </trim>
         ORDER BY t1.create_time DESC
     </select>