Commit 94da5a28 authored by liwenbin's avatar liwenbin

f

parent 579cfc65
...@@ -240,6 +240,16 @@ public class AssetServiceImpl implements IAssetService{ ...@@ -240,6 +240,16 @@ public class AssetServiceImpl implements IAssetService{
if (expression.contains("audit_result")) { if (expression.contains("audit_result")) {
hasAuditResultLimit = true; hasAuditResultLimit = true;
} }
}
// 必须前置,不然如果没有判断的参数就会报错
if (!hasAuditResultLimit) {
// 如果没配,自动过一层auditResult@true的条件
if (!ruleService.valid("audit_result==true", data)) {
continue A;
}
}
for (ChannelFundConfig.Limit limit : limits) {
String expression = limit.getLimit();
// 如果是拒绝原因判断并且没有配置拒绝原因,不满足 // 如果是拒绝原因判断并且没有配置拒绝原因,不满足
if (expression.contains("refuseReason") && data.get("refuseReason") == null) { if (expression.contains("refuseReason") && data.get("refuseReason") == null) {
continue A; continue A;
...@@ -249,12 +259,6 @@ public class AssetServiceImpl implements IAssetService{ ...@@ -249,12 +259,6 @@ public class AssetServiceImpl implements IAssetService{
} }
} }
} }
if (!hasAuditResultLimit) {
// 如果没配,自动过一层auditResult@true的条件
if (!ruleService.valid("audit_result==true", data)) {
continue A;
}
}
// 创建并增加资方配置 // 创建并增加资方配置
JSONObject fundInfoJSON = new JSONObject(); JSONObject fundInfoJSON = new JSONObject();
fundInfoJSON.put("fundId", channelFundConfig.getFundId()); fundInfoJSON.put("fundId", channelFundConfig.getFundId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment