From dc1081ff9a4acdca58a75f1315961729be47365c Mon Sep 17 00:00:00 2001 From: dialYun <1552333077@qq.com> Date: Wed, 26 Mar 2025 14:34:42 +0000 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20getAuthObjName=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=9C=A8=E6=B4=BE=E7=94=9F?= =?UTF-8?q?=E7=B1=BB=E4=B8=AD=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dialYun <1552333077@qq.com> --- .../java/io/nop/biz/crud/CrudBizModel.java | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/nop-biz/src/main/java/io/nop/biz/crud/CrudBizModel.java b/nop-biz/src/main/java/io/nop/biz/crud/CrudBizModel.java index 5f1a677bf..2ab150e5e 100644 --- a/nop-biz/src/main/java/io/nop/biz/crud/CrudBizModel.java +++ b/nop-biz/src/main/java/io/nop/biz/crud/CrudBizModel.java @@ -105,6 +105,7 @@ import static io.nop.biz.BizConstants.METHOD_FIND_COUNT; import static io.nop.biz.BizConstants.METHOD_FIND_FIRST; import static io.nop.biz.BizConstants.METHOD_FIND_LIST; import static io.nop.biz.BizConstants.METHOD_FIND_PAGE; +import static io.nop.biz.BizConstants.METHOD_FIND_TREE_LIST; import static io.nop.biz.BizConstants.METHOD_FIND_TREE_PAGE; import static io.nop.biz.BizConstants.METHOD_TRY_DELETE; import static io.nop.biz.BizConstants.METHOD_TRY_SAVE; @@ -184,6 +185,10 @@ public abstract class CrudBizModel implements IBizModelImp return bizObjName; } + public String getAuthObjName(String action) { + return getBizObjName(); + } + /** * 如果强制指定BizObjName，则以指定的值为准 */ @@ -246,7 +251,7 @@ public abstract class CrudBizModel implements IBizModelImp if (query != null) query.setDisableLogicalDelete(false); - return doFindCount0(query, getBizObjName(), this::invokeDefaultPrepareQuery, context); + return doFindCount0(query, getAuthObjName(METHOD_FIND_COUNT), this::invokeDefaultPrepareQuery, context); } @BizAction @@ -282,7 +287,7 @@ public abstract class CrudBizModel implements IBizModelImp public PageBean doFindPage(@Name("query") @Description("@i18n:biz.query|查询条件") QueryBean query, @Name("prepareQuery") BiConsumer prepareQuery, FieldSelectionBean selection, IServiceContext context) { - return doFindPage0(query, getBizObjName(), prepareQuery, selection, context); + return doFindPage0(query, getAuthObjName(METHOD_FIND_PAGE), prepareQuery, selection, context); } @BizAction @@ -342,7 +347,7 @@ public abstract class CrudBizModel implements IBizModelImp @Name("prepareQuery") BiConsumer prepareQuery, IServiceContext context) { if (authObjName == null) - authObjName = getBizObjName(); + authObjName = getAuthObjName(action); checkAllowQuery(query, getThisObj().getObjMeta()); @@ -451,7 +456,7 @@ public abstract class CrudBizModel implements IBizModelImp public T doFindFirst(@Name("query") @Description("@i18n:biz.query|查询条件") QueryBean query, @Name("prepareQuery") BiConsumer prepareQuery, FieldSelectionBean selection, IServiceContext context) { - return doFindFirst0(query, getBizObjName(), prepareQuery, selection, context); + return doFindFirst0(query, getAuthObjName(METHOD_FIND_FIRST), prepareQuery, selection, context); } @BizAction @@ -674,7 +679,7 @@ public abstract class CrudBizModel implements IBizModelImp if (dataAuthChecker == null) return; - String bizObjName = getBizObjName(); + String bizObjName = getAuthObjName(action); if (!dataAuthChecker.isPermitted(bizObjName, action, entity, context)) { throw new NopException(ERR_AUTH_NO_DATA_AUTH).param(ARG_BIZ_OBJ_NAME, bizObjName); } @@ -685,7 +690,7 @@ public abstract class CrudBizModel implements IBizModelImp if (dataAuthChecker == null) return; - String bizObjName = getBizObjName(); + String bizObjName = getAuthObjName(BizConstants.METHOD_UPDATE); if (!dataAuthChecker.isPermitted(bizObjName, BizConstants.METHOD_UPDATE, entity, context)) { throw new NopException(ERR_AUTH_NO_DATA_AUTH_AFTER_UPDATE).param(ARG_BIZ_OBJ_NAME, bizObjName); } @@ -1281,7 +1286,7 @@ public abstract class CrudBizModel implements IBizModelImp public int updateByQuery(@Name("query") QueryBean query, @Name("data") Map data, IServiceContext context) { if (query != null) query.setDisableLogicalDelete(false); - return doUpdateByQuery(query, getBizObjName(), data, null, this::invokeDefaultPrepareUpdate, context); + return doUpdateByQuery(query, getAuthObjName(METHOD_FIND_LIST), data, null, this::invokeDefaultPrepareUpdate, context); } @BizAction @@ -1321,7 +1326,7 @@ public abstract class CrudBizModel implements IBizModelImp if (query != null) query.setDisableLogicalDelete(false); - return doDeleteByQuery(query, getBizObjName(), getDefaultRefNamesToCheckExists(), + return doDeleteByQuery(query, getAuthObjName(METHOD_FIND_LIST), getDefaultRefNamesToCheckExists(), null, this::invokeDefaultPrepareDelete, context); } @@ -1394,7 +1399,7 @@ public abstract class CrudBizModel implements IBizModelImp @Name("prepareQuery") BiConsumer prepareQuery, FieldSelectionBean selection, IServiceContext context) { - return doFindList0(query, getBizObjName(), prepareQuery, selection, context); + return doFindList0(query, getAuthObjName(METHOD_FIND_LIST), prepareQuery, selection, context); } @BizAction @@ -1621,7 +1626,7 @@ public abstract class CrudBizModel implements IBizModelImp @BizQuery @Description("分页查询树状结构") public PageBean findTreeEntityPage(@Name("query") QueryBean query, FieldSelectionBean selection, IServiceContext context) { - return doFindTreeEntityPage(query, getBizObjName(), null, selection, context); + return doFindTreeEntityPage(query, getAuthObjName(METHOD_FIND_TREE_PAGE), null, selection, context); } @BizAction @@ -1668,7 +1673,7 @@ public abstract class CrudBizModel implements IBizModelImp @BizQuery @Description("查询树状结构") public List findTreeEntityList(@Name("query") QueryBean query, FieldSelectionBean selection, IServiceContext context) { - return doFindTreeEntityList(query, getBizObjName(), null, selection, context); + return doFindTreeEntityList(query, getAuthObjName(METHOD_FIND_TREE_LIST), null, selection, context); } @BizAction @@ -1689,7 +1694,7 @@ public abstract class CrudBizModel implements IBizModelImp @BizQuery @Description("查询树状结构") public List findListForTree(@Name("query") QueryBean query, FieldSelectionBean selection, IServiceContext context) { - return doFindListForTree(query, getBizObjName(), null, selection, context); + return doFindListForTree(query, getAuthObjName(METHOD_FIND_TREE_LIST), null, selection, context); } @BizAction @@ -1710,7 +1715,7 @@ public abstract class CrudBizModel implements IBizModelImp @BizQuery @Description("分页查询树状结构") public PageBean findPageForTree(@Name("query") QueryBean query, FieldSelectionBean selection, IServiceContext context) { - return doFindPageForTree(query, getBizObjName(), null, selection, context); + return doFindPageForTree(query, getAuthObjName(METHOD_FIND_TREE_PAGE), null, selection, context); } @BizAction -- Gitee