Merge branch 'auth'

# Conflicts:
#	boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.constant.GenConstants;
 import com.boman.common.core.utils.SecurityUtils;
-import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.array.ArrayUtils;
 import com.boman.common.core.utils.collection.CollectionUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
@@ -14,24 +13,14 @@ import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
 import com.boman.domain.GenTable;
 import com.boman.domain.GenTableColumn;
-import com.boman.domain.SysDictData;
-import com.boman.domain.GenTable;
-import com.boman.domain.GenTableColumn;
 import com.boman.domain.constant.*;
+import com.boman.domain.exception.NoSuchFunctionException;
 import com.boman.gen.api.RemoteGenTableColumnService;
 import com.boman.gen.api.RemoteGenTableService;
 import com.boman.web.core.domain.ActionType;
 import com.boman.web.core.domain.FormDataDto;
 import com.boman.web.core.domain.RowResult;
 import com.boman.web.core.domain.TableContext;
-import com.boman.system.api.RemoteDeptService;
-import com.boman.system.api.RemoteDictDataService;
-import com.boman.system.api.RemoteRoleDataService;
-import com.boman.system.api.RemoteUserService;
-import com.boman.web.core.domain.ActionType;
-import com.boman.web.core.domain.FormDataDto;
-import com.boman.web.core.domain.RowResult;
-import com.boman.web.core.domain.TableContext;
 import com.boman.web.core.service.delete.IBaseDeleteService;
 import com.boman.web.core.service.save.IBaseSaveService;
 import com.boman.web.core.service.select.IBaseSelectService;
@@ -312,6 +301,11 @@ public class TableServiceCmdService {
             return getByTableName(tableName, columns, isUi);
         }
 
+        // 权限
+        if (checkAuthGetObject(genTable, id)) {
+            throw new NoSuchFunctionException("此模块:[" + genTable.getFunctionName() + "]， 无根据id获取功能");
+        }
+
         // 默认查所有字段，不支持自定义
         String pkName = IdUtils.getPkName(genTable.getColumns());
         JSONObject json = selectService.selectById(tableName, pkName, id);

boman-web-core/src/main/java/com/boman/web/core/utils/AuthUtils.java

@@ -53,7 +53,7 @@ public class AuthUtils {
     }
 
     public static void checkAuthQueryList(GenTable genTable, JSONObject condition) {
-        containsFunction(genTable.getMenuRole(), GenTable.Q, "此模块:[" + genTable.getTableName() + "], 没有查询功能");
+        containsFunction(genTable.getMenuRole(), GenTable.Q, "此模块:[" + genTable.getFunctionName() + "], 没有查询功能");
 
         LoginUser loginUser = getLoginUser();
         if (SysUser.isAdmin(loginUser.getUserid())) {
@@ -71,6 +71,10 @@ public class AuthUtils {
         packAuthCondition(roleData.getDataScope(), condition, loginUser);
     }
 
+    public static boolean checkAuthGetObject(GenTable genTable, Long id) {
+        return checkAuthObjectDelete(genTable, id, IdUtils.getPkName(genTable.getColumns()));
+    }
+
     /**
      * 功能描述: 某一张表是否有AMD....功能
      *