sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java

@@ -471,7 +471,7 @@ public class TmTaskController extends BaseController {
 
                 //修改领料任务表信息
                 //先判断 目前数据库有几个公司
-//                List<LeaseApplyInfo> list = tmTaskService.getListSome(task.getTaskId());
+                List<LeaseApplyInfo> list = tmTaskService.getListSome(task.getTaskId());
                 LeaseApplyInfo infoAdd = new LeaseApplyInfo();
            /*     if (list.size() < 2) {
                     List<List<LeaseApplyDetails>> deviceByCompanyList = CollUtil.groupByField(task.getLeaseApplyDetails(), "companyId");

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java

@@ -793,7 +793,6 @@ public class TmTaskServiceImpl implements TmTaskService {
                     // 去查询领料任务详情表
                     List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetailsByApply(leaseApplyInfo);
                     if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
-                        leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
                         listLeaseDetails.addAll(leaseApplyDetails);
                     }
                 }