权限树调整

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/PermissionFeignService.java

@@ -279,9 +279,13 @@ public class PermissionFeignService {
 
         for(int b=0;b<deActionArray.size();b++) {
             JSONObject deSource = deActionArray.getJSONObject(b);
+            String deActionId=deSource.getString("id");
             String deActionType=deSource.getString("type");
-            //数据查询与自定义行为不生成预置范围相关数据
-            if( (permissionType.equalsIgnoreCase(DEActionType)  && !deActionType.equalsIgnoreCase("BUILTIN")) || (permissionType.equalsIgnoreCase(DataSetTag))   ) {
+            //getDraft、CheckKey行为、自定义行为、数据查询不生成预置范围相关数据
+            if(     (permissionType.equalsIgnoreCase(DEActionType)  && deActionId.equalsIgnoreCase("GetDraft"))  ||
+                    (permissionType.equalsIgnoreCase(DEActionType)  && deActionId.equalsIgnoreCase("CheckKey"))  ||
+                    (permissionType.equalsIgnoreCase(DEActionType)  && !deActionType.equalsIgnoreCase("BUILTIN")) ||
+                    (permissionType.equalsIgnoreCase(DataSetTag))   ) {
                 JSONObject dataScope =new JSONObject();
                 dataScope.put("id","all");
                 dataScope.put("name","全部数据");