no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/ContractTemplateLogic.java

@@ -66,6 +66,11 @@ public class ContractTemplateLogic {
         List<ContractWebsitBean> websitBeanList = commonMapper.contractWebsitList(contractTemplateId);
         bean.setItems(websitBeanList);
 
+        final List<ContractTemplateField> fields = contractTemplateFieldService.lambdaQuery()
+                .eq(ContractTemplateField::getContractTemplateId, contractTemplateId)
+                .list();
+        bean.setFieldItems(fields);
+
         return bean;
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/WorkerSettleExpenseLogic.java

@@ -874,6 +874,8 @@ public class WorkerSettleExpenseLogic {
             wages.setId(settleMonthWagesId);
             wages.setCompanyWechatId(companyWechatId);
             wages.setCompanyWechatName(companyWechatName);
+            wages.setWebsitId(websitEntry.getValue().get(0).getWebsitId());
+            wages.setWebsitName(websitEntry.getValue().get(0).getWebsitName());
             wages.setName(bean.getName());
             wages.setSettleByCount(byCount);
             wages.setSettleAmount(settleAmount);