Commit 8af3c618 authored by 王业雄's avatar 王业雄

fix

parent 63e44bb4
......@@ -197,8 +197,12 @@ public class ChannelRouteServiceImpl implements IChannelRouteService {
}else {
channelRuleEntity.setEnable(false);
}
channelRuleEntity.setUserTag("["+channelRuleEntity.getUserTag()+"]");
channelRuleEntity.setUserLevel("["+channelRuleEntity.getUserLevel()+"]");
if (!StringUtils.isEmpty(channelRuleEntity.getUserTag())){
channelRuleEntity.setUserTag("["+channelRuleEntity.getUserTag()+"]");
}
if (!StringUtils.isEmpty(channelRuleEntity.getUserLevel())){
channelRuleEntity.setUserLevel("["+channelRuleEntity.getUserLevel()+"]");
}
channelRuleRepository.save(channelRuleEntity);
}
});
......
......@@ -224,6 +224,7 @@ public class FundProductServiceImpl implements IFundProductService {
break;
case "tel_area_list":
//手机号区域限制
log.info("tel_area_list={}",areaRuleConcrete.getTelAreaNameList());
if (Objects.nonNull(areaRuleConcrete)){
try {
String telAreaCodeListByName = getTelAreaCodeListByName(areaRuleConcrete.getTelAreaNameList());
......@@ -343,6 +344,8 @@ public class FundProductServiceImpl implements IFundProductService {
if (!StringUtils.isEmpty(ruleList.toString())){
one.setRuleList(ruleList.substring(0,ruleList.lastIndexOf(",")));
}else {
one.setRuleList("");
}
one.setAreaRule(JSONObject.toJSONString(areaRuleConcrete));
fundProductRepository.save(one);
......@@ -388,7 +391,7 @@ public class FundProductServiceImpl implements IFundProductService {
List<String> telAreaCodeList = new ArrayList<>();
for (int i = 0;i< split.length;i++){
for (AreaCode areaCode:list){
if (areaCode.getName().equals(split[i])){
if (areaCode.getName().trim().equals(split[i].trim())){
telAreaCodeList.add(areaCode.getAdcode());
break;
}
......
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