对象组提交
This commit is contained in:
@@ -11,6 +11,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import com.nis.web.dao.basics.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@@ -50,7 +51,8 @@ public class CommonGroupManageService extends BaseService{
|
||||
private DomainCommGroupDao domainCommGroupDao;
|
||||
@Autowired
|
||||
private ScriberIdCommGroupDao scriberIdCommGroupDao;
|
||||
|
||||
@Autowired
|
||||
private PolicyGroupInfoDao policyGroupInfoDao;
|
||||
public Page<CommonGroupInfo> findCommonGroupInfoList(Page<CommonGroupInfo> page, CommonGroupInfo entity) {
|
||||
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
|
||||
entity.setPage(page);
|
||||
@@ -108,7 +110,8 @@ public class CommonGroupManageService extends BaseService{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(ids);
|
||||
transObjGroupToMaat(policyGroupInfos);
|
||||
}
|
||||
|
||||
// 分组配置界面使用
|
||||
@@ -205,7 +208,7 @@ public class CommonGroupManageService extends BaseService{
|
||||
|
||||
/**
|
||||
* 校验执行删除操作后分组下域配置是否为空
|
||||
* @param serviceGroupIds
|
||||
* @param grouIdAndCfgId
|
||||
* @param groupType
|
||||
* @return
|
||||
*/
|
||||
@@ -225,7 +228,7 @@ public class CommonGroupManageService extends BaseService{
|
||||
map.put(groupId, list);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
List<Integer> resultList = new ArrayList<Integer>();
|
||||
for (Integer groupId : map.keySet()) {
|
||||
List<Integer> cfgIdList = map.get(groupId);
|
||||
@@ -243,7 +246,7 @@ public class CommonGroupManageService extends BaseService{
|
||||
}else if(groupType == 9) { // ScriberId
|
||||
size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), ScriberIdCommCfg.getTablename());
|
||||
}
|
||||
|
||||
|
||||
if(size == 0) { // 0为分组下的最后一条配置,获取配置ID提示
|
||||
Integer compileId = commonGroupManageDao.getCompileIdByGroupId(","+groupId+",");
|
||||
if(compileId != null) {
|
||||
@@ -253,5 +256,5 @@ public class CommonGroupManageService extends BaseService{
|
||||
}
|
||||
return resultList;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user