Bläddra i källkod

fix bug:/dict/query接口返回信息点的path键的判断逻辑问题

lijie 3 år sedan
förälder
incheckning
de17779160

+ 15 - 5
src/main/java/com/persagy/proxy/dictionary/service/impl/AbstractAdmDictBaseServiceImpl.java

@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Value;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @ClassName AbstractAdmDictBaseServiceImpl
@@ -43,6 +44,10 @@ import java.util.List;
 @Slf4j
 public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T> {
 
+    private static final Set<String> TABLE_INFOS=CollUtil.newHashSet("id","code","localId",
+            "localName","groupCode","projectId","objType","classCode","grouping","virtualCodes","createApp","updateApp",
+            "creator","creationTime","modifier","modifiedTime","valid");
+
     @Autowired
     private DmpRwdClient rwdClient;
 
@@ -202,12 +207,17 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
             admVO.setSort(admVO.getShowOrder());
 
             //path路径处理
-            if(StringUtils.isEmpty(admVO.getFirstName())
-                    || AdmDictConstant.FIRST_BASE_TAG.equals(admVO.getFirstName())
-                    || AdmDictConstant.HIS_FIRST_BASE_TAG.equals(admVO.getFirstName())
-                    || AdmDictConstant.HIS_FIRST_BASE_TAG_TWO.equals(admVO.getFirstName())){
+//            if(StringUtils.isEmpty(admVO.getFirstName())
+//                    || AdmDictConstant.FIRST_BASE_TAG.equals(admVO.getFirstName())
+//                    || AdmDictConstant.HIS_FIRST_BASE_TAG.equals(admVO.getFirstName())
+//                    || AdmDictConstant.HIS_FIRST_BASE_TAG_TWO.equals(admVO.getFirstName())){
+//                admVO.setPath(admVO.getCode());
+//            }else{
+//                admVO.setPath(AdmDictConstant.INFOS_EX+admVO.getCode());
+//            }
+            if (TABLE_INFOS.contains(admVO.getCode())){
                 admVO.setPath(admVO.getCode());
-            }else{
+            }else {
                 admVO.setPath(AdmDictConstant.INFOS_EX+admVO.getCode());
             }