66666
This commit is contained in:
parent
333da783cb
commit
327698768f
@ -219,8 +219,8 @@ public class ExpertFxqService {
|
||||
// 获取数据库模版数据
|
||||
LambdaQueryWrapper<FxqTemplateEntity> templateQueryWrapper = new LambdaQueryWrapper<>();
|
||||
templateQueryWrapper.eq(FxqTemplateEntity::getCompanyId, companyId);
|
||||
FxqTemplateEntity fxqTemplate = fxqTemplateDao.selectOne(templateQueryWrapper);
|
||||
if (fxqTemplate == null) {
|
||||
List<FxqTemplateEntity> fxqTemplates = fxqTemplateDao.selectList(templateQueryWrapper);
|
||||
if (fxqTemplates == null || fxqTemplates.isEmpty()){
|
||||
// 获取企业模版数据
|
||||
GetTemplateListResponse templateList = fxqTask.getTemplateList(companyFxqCompany.getUnionId());
|
||||
if (templateList.getData() == null || templateList.getData().isEmpty()) {
|
||||
@ -262,12 +262,24 @@ public class ExpertFxqService {
|
||||
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fxqTemplates = fxqTemplateDao.selectList(templateQueryWrapper);
|
||||
if (fxqTemplates == null || fxqTemplates.isEmpty()) {
|
||||
throw new BusinessException("操作失败:未找到合适模版");
|
||||
}
|
||||
|
||||
FxqTemplateEntity fxqTemplate = null;
|
||||
for (FxqTemplateEntity m : fxqTemplates) {
|
||||
if (m.getTemplateNo().equals("FT1751936689226311")) {
|
||||
fxqTemplate = m;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// 把第一条数据赋值出去
|
||||
if (fxqTemplate == null) {
|
||||
fxqTemplate = fxqTemplateData;
|
||||
}
|
||||
}
|
||||
throw new BusinessException("操作失败:未找到合适模版");
|
||||
}
|
||||
|
||||
return fxqTemplate;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user