1.增加生成账单判断业务日期是否为空

2.场站api通知问题修改

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/ExpenseApplicationServiceImpl.java

@@ -370,6 +370,9 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 				if (1 == item.getAccStatus()) {
 					throw new RuntimeException("费用：" + item.getFeeCnName() + "已生成账单");
 				}
+				if (ObjectUtils.isNull(item.getBillDate())){
+					throw new RuntimeException("费用：" + item.getFeeCnName() + "缺少业务日期，请重新保存");
+				}
 				FinAccBills data = new FinAccBills();
 				data.setGenerationCorpId(item.getGenerationCorpId());
 				data.setGenerationCorpCnName(item.getGenerationCorpCnName());

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -225,6 +225,12 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					throw new RuntimeException(year + "年" + month + "月账期已锁定,保存失败");
 				}
 			}
+		} else {
+			if ("SE".equals(bills.getBusinessType())) {
+				bills.setBillDate(bills.getActualEtd());
+			} else if ("SI".equals(bills.getBusinessType())) {
+				bills.setBillDate(bills.getActualEta());
+			}
 		}
 		if (ObjectUtils.isNotNull(bills.getCorpId())) {
 			BCorps bCorps = corpsMapper.selectById(bills.getCorpId());

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -128,6 +128,9 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 			if (1 == item.getAccStatus()) {
 				throw new RuntimeException("费用：" + item.getFeeCnName() + "已生成账单");
 			}
+			if (ObjectUtils.isNull(item.getBillDate())){
+				throw new RuntimeException("费用：" + item.getFeeCnName() + "缺少业务日期，请重新保存");
+			}
 			item.setBillKey(item.getId() + "");
 			/*boolean amountStatus = true;
 			if (new BigDecimal("0.00").compareTo(item.getAmount()) > 0) {

blade-service/blade-los/src/main/java/org/springblade/los/ftp/service/impl/CyFtpServiceImpl.java

@@ -606,7 +606,7 @@ public class CyFtpServiceImpl implements CyFtpService {
 			boxDynamicsRecord.setDescription("接收成功");
 		}
 		//发送消息
-		R<String> res = sysClient.getRoleIds(AuthUtil.getTenantId(), "箱管");
+		R<String> res = sysClient.getRoleIds(bCorps.getTenantId(), "箱管");
 		if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 			R<List<User>> userListR = userClient.listUserByRoleIds(res.getData());
 			if (userListR.isSuccess() && ObjectUtils.isNotNull(userListR.getData())) {

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -88,7 +88,7 @@ public class UserClient implements IUserClient {
 			LambdaQueryWrapper<User> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			userLambdaQueryWrapper
 				.eq(User::getIsDeleted, 0)
-				.apply("find_in_set(role_id,'" + roleId + "')")
+				.apply("find_in_set('" + roleId + "',role_id)")
 				.eq(User::getTenantId, AuthUtil.getTenantId());
 			List<User> users = service.list(userLambdaQueryWrapper);
 			if (!users.isEmpty()) {