问题处理

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountPaymentServiceImpl.java

@@ -134,11 +134,12 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
      */
     @Override
     public AccountPaymentVo detail(Long id) {
-        AccountPayment accountPayment = baseMapper.detail(id);
-        AccountPaymentVo result = BeanUtil.toBean(accountPayment, AccountPaymentVo.class);
+        AccountPayment AccountPayment = baseMapper.detail(id);
+        AccountPaymentVo result = BeanUtil.toBean(AccountPayment, AccountPaymentVo.class);
 
+        //赋值打款中实际的付款账户
         if (ObjectUtil.isNotEmpty(result.getAccountManagementId())) {
-            //查询实际打款的付款账户名称
+            //查询实际打款的付款账户名称；
             AccountManagement accountManagement = accountManagementService.getById(result.getAccountManagementId());
             if (ObjectUtil.isNotEmpty(accountManagement)) {
                 result.setAccountManagementName(accountManagement.getName());
@@ -146,6 +147,15 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
 
         }
 
+        //赋值请款的付款账户名称
+        if (ObjectUtil.isNotEmpty(result.getBusinessManagementId())) {
+            //查询业务中选中的付款账户名称
+            AccountManagement accountManagement = accountManagementService.getById(result.getBusinessManagementId());
+            if (ObjectUtil.isNotEmpty(accountManagement)) {
+                result.setBusinessManagementName(accountManagement.getName());
+            }
+
+        }
         return result;
     }
 

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskDetailServiceImpl.java

@@ -544,6 +544,9 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
 
 
         List<ProductionTaskDetailVo> records = page.getRecords();
+        if(ObjectUtil.isEmpty(records)){
+            return page;
+        }
         List<Long> productIds = records.stream().map(ProductionTaskDetail::getProductId).distinct().collect(Collectors.toList());
         List<ApplicableProducts> applicableProducts = applicableProductsService.list(q -> q.in(ApplicableProducts::getProductId, productIds));
         if (ObjectUtil.isNotEmpty(applicableProducts)) {