ソースを参照

创建所在系统和楼层的关系及查询字典是否可见bug修复

linhuili 3 年 前
コミット
cacd5fe0a7

+ 3 - 1
src/main/java/com/persagy/proxy/adm/controller/RelationSyInFlController.java

@@ -86,7 +86,9 @@ public class RelationSyInFlController {
         //楼层Id
         List<String> floorIdList = syInFlList.getFloorIdList();
         if (StringUtils.isBlank(sysId) || CollectionUtils.isEmpty(floorIdList)) {
-            return AdmResponse.failure("必填项:sysId(系统id)、floorIdList(楼层Id)");
+            //return AdmResponse.failure("必填项:sysId(系统id)、floorIdList(楼层Id)");
+            //兼容adm历史逻辑,若楼层id为空时,返回success
+            return AdmResponse.success();
         }
         List<RelationDTO> voList = new ArrayList<>();
         AdmRelationTypeEnum sy2fl = AdmRelationTypeEnum.SY2FL;

+ 3 - 2
src/main/java/com/persagy/proxy/adm/service/impl/AbstractAdmDictBaseServiceImpl.java

@@ -209,11 +209,12 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
 
             //信息点是否可见
             if(admVO.getVisible() == null){
-                if("localName".equals(admVO.getCode()) || "localId".equals(admVO.getCode())){
+                /*if("localName".equals(admVO.getCode()) || "localId".equals(admVO.getCode())){
                     admVO.setVisible(true);
                 }else{
                     admVO.setVisible(false);
-                }
+                }*/
+                admVO.setVisible(true);
             }
             //信息点是否可编辑
             if(admVO.getEditable() == null){