浏览代码

Merge remote-tracking branch 'origin/master'

guoyujia 1 年之前
父节点
当前提交
072fac7f45

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

@@ -146,8 +146,12 @@ public class BizDayworkController extends BaseController {
 
         // 如果关键字不为空,则根据关键字匹配批次,后面会根据批次进行daywork过滤
         List<BizLot> lots = new ArrayList<>();
-        if (!keywords.isEmpty())
+        if (!keywords.isEmpty()) {
             lots = bizLotService.query().like("lot_code", keywords).list();
+            if(lots.size()==0){
+              return   success(new ArrayList<>());
+            }
+        }
 
 
         // 获取当前用户的,针对当前部门以及当前生产计划下的报工集合