当组为空的时候不审核,修复排序报错

This commit is contained in:
wangxin
2019-06-15 16:53:43 +08:00
parent 10d153c40f
commit 1d0835a563
10 changed files with 77 additions and 31 deletions

View File

@@ -287,6 +287,9 @@ public class ObjectGroupService extends BaseService {
//查询子配置并修改审核状态
entity = this.getObjGroupPolicy(entity.getCfgId());
// if(StringUtils.isBlank(entity.getCommonGroupIds())){
//
// }
ServiceConfigTemplateUtil templateUtil=new ServiceConfigTemplateUtil();
List<Map<String,Object>> serviceMapList= ServiceConfigTemplateUtil.getServiceList();
List<FunctionServiceDict> dicts=DictUtils.getFunctionServiceDictList();
@@ -388,7 +391,12 @@ public class ObjectGroupService extends BaseService {
maatCfg.setAction(2);
}
BeanUtils.copyProperties(entity, maatCfg);
maatCfg.setAction(entity.getAction());
if(entity.getServiceId().equals(512)){
maatCfg.setAction(2);
}else{
maatCfg.setAction(entity.getAction());
}
maatCfg.setAuditTime(entity.getAuditTime());
maatCfg.setIpRegionList(ipRegionList);
maatCfg.setStrRegionList(strRegionList);