瀏覽代碼

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 年之前
父節點
當前提交
bdf20cde89
共有 1 個文件被更改,包括 7 次插入2 次删除
  1. 7 2
      src/main/java/com/persagy/proxy/dictionary/service/impl/AdmDictServiceImpl.java

+ 7 - 2
src/main/java/com/persagy/proxy/dictionary/service/impl/AdmDictServiceImpl.java

@@ -292,8 +292,13 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
         for (AdmDefFuncIdGather funcIdGather : content) {
             ObjectInfoCollect infoCollect = new ObjectInfoCollect();
 
-            infoCollect.setGroupCode(funcIdGather.getGroupCode());
-            infoCollect.setProjectId(funcIdGather.getProjectId());
+            if(StringUtils.isNotEmpty(funcIdGather.getType()) && "common".equals(funcIdGather.getType())){
+                infoCollect.setGroupCode("0");
+                infoCollect.setProjectId("0");
+            }else{
+                infoCollect.setGroupCode(context.getGroupCode());
+                infoCollect.setProjectId(context.getProjectId());
+            }
             infoCollect.setDefineInfoId(funcIdGather.getId());
             infoCollect.setClassCode(funcIdGather.getClassCode());
             infoCollect.setCode(funcIdGather.getCode());