|
@@ -365,23 +365,23 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
admObjectInfos = sortFuncidForEdit(admObjectInfos);
|
|
|
//查询平台级信息点采集信息
|
|
|
List<ObjectInfoCollect> commonObjectInfoCollect = queryObjectInfoCollect(context, "common", request.getType(), clazz);
|
|
|
- Map<String, Boolean> commonObjectInfoCollectMap = new HashMap<>();
|
|
|
+ Map<String, ObjectInfoCollect> commonObjectInfoCollectMap = new HashMap<>();
|
|
|
for(int i = 0,j = CollUtil.size(commonObjectInfoCollect);i < j;i++) {
|
|
|
ObjectInfoCollect collect = commonObjectInfoCollect.get(i);
|
|
|
if(StrUtil.isBlank(collect.getDefineInfoId())) {
|
|
|
continue;
|
|
|
}
|
|
|
- commonObjectInfoCollectMap.put(collect.getDefineInfoId(), BooleanUtil.isTrue(collect.getVisiable()));
|
|
|
+ commonObjectInfoCollectMap.put(collect.getDefineInfoId(),collect);
|
|
|
}
|
|
|
//查询项目级信息点采集信息
|
|
|
List<ObjectInfoCollect> projectObjectInfoCollect = queryObjectInfoCollect(context, "project", request.getType(), clazz);
|
|
|
- Map<String, Boolean> projectObjectInfoCollectMap = new HashMap<>();
|
|
|
+ Map<String, ObjectInfoCollect> projectObjectInfoCollectMap = new HashMap<>();
|
|
|
for(int i = 0,j = CollUtil.size(projectObjectInfoCollect);i < j;i++) {
|
|
|
ObjectInfoCollect collect = projectObjectInfoCollect.get(i);
|
|
|
if(StrUtil.isBlank(collect.getDefineInfoId())) {
|
|
|
continue;
|
|
|
}
|
|
|
- projectObjectInfoCollectMap.put(collect.getDefineInfoId(), BooleanUtil.isTrue(collect.getVisiable()));
|
|
|
+ projectObjectInfoCollectMap.put(collect.getDefineInfoId(),collect);
|
|
|
}
|
|
|
String dictType = request.getDictType();
|
|
|
|
|
@@ -421,7 +421,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
* @param admObjectInfos
|
|
|
* @param objectInfoCollectMap
|
|
|
*/
|
|
|
- private void setObjectInfoVisiable(List<AdmObjectInfo> admObjectInfos,Map<String, Boolean> objectInfoCollectMap,String dictType){
|
|
|
+ private void setObjectInfoVisiable(List<AdmObjectInfo> admObjectInfos,Map<String, ObjectInfoCollect> objectInfoCollectMap,String dictType){
|
|
|
if(CollUtil.isEmpty(admObjectInfos)){
|
|
|
return;
|
|
|
}
|
|
@@ -429,7 +429,11 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
Boolean visiable = null;
|
|
|
String id = admObjectInfo.getId();
|
|
|
if(CollUtil.isNotEmpty(objectInfoCollectMap)){
|
|
|
- visiable = objectInfoCollectMap.get(id);
|
|
|
+ ObjectInfoCollect collect = objectInfoCollectMap.get(id);
|
|
|
+ if(collect != null){
|
|
|
+ visiable = collect.getVisiable();
|
|
|
+ admObjectInfo.setKeyWord(collect.getKeyWord());
|
|
|
+ }
|
|
|
}
|
|
|
if(visiable == null){
|
|
|
if("common".equals(dictType)){
|
|
@@ -444,6 +448,9 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
admObjectInfo.setVisible(visiable);
|
|
|
admObjectInfo.setEditable(true);
|
|
|
admObjectInfo.setUnDisabled(true);
|
|
|
+ if(admObjectInfo.getKeyWord() == null){
|
|
|
+ admObjectInfo.setKeyWord(false);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -453,7 +460,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
* @param admObjectInfos
|
|
|
* @param objectInfoCollectMap
|
|
|
*/
|
|
|
- private void setOnlyQueryObjectInfoVisiable(List<AdmObjectInfo> admObjectInfos,Map<String, Boolean> objectInfoCollectMap,String dictType){
|
|
|
+ private void setOnlyQueryObjectInfoVisiable(List<AdmObjectInfo> admObjectInfos,Map<String, ObjectInfoCollect> objectInfoCollectMap,String dictType){
|
|
|
if(CollUtil.isEmpty(admObjectInfos)){
|
|
|
return;
|
|
|
}
|
|
@@ -462,7 +469,11 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
String id = admObjectInfo.getId();
|
|
|
//设置信息点是否可见
|
|
|
if(CollUtil.isNotEmpty(objectInfoCollectMap)){
|
|
|
- visiable = objectInfoCollectMap.get(id);
|
|
|
+ ObjectInfoCollect collect = objectInfoCollectMap.get(id);
|
|
|
+ if(collect!=null){
|
|
|
+ visiable = collect.getVisiable();
|
|
|
+ admObjectInfo.setKeyWord(collect.getKeyWord());
|
|
|
+ }
|
|
|
}
|
|
|
if(visiable == null && ("localId".equals(admObjectInfo.getCode()) || "localName".equals(admObjectInfo.getCode()))){
|
|
|
visiable = true;
|
|
@@ -488,6 +499,9 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
admObjectInfo.setUnDisabled(true);
|
|
|
}
|
|
|
}
|
|
|
+ if(admObjectInfo.getKeyWord() == null){
|
|
|
+ admObjectInfo.setKeyWord(false);
|
|
|
+ }
|
|
|
admObjectInfo.setVisible(visiable);
|
|
|
}
|
|
|
}
|
|
@@ -541,7 +555,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
}else{
|
|
|
criteria.setFilters("groupCode = '"+context.getGroupCode()+"' and projectId = '"+context.getProjectId()+"'");
|
|
|
}
|
|
|
- criteria.setName(classCode);
|
|
|
+ //criteria.setName(classCode);
|
|
|
AdmResponse admResponse = doQueryObjectInfoCollect(context, criteria, "classCode", clazz);
|
|
|
return (List<ObjectInfoCollect>) admResponse.getContent();
|
|
|
}
|