From 4c37374149d56aef3f0a923dd5f41f9a01839500 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 18 一月 2024 11:48:58 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index ad4b63b..2284000 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -510,7 +510,7 @@
* @return 涓婚搴撳垎绫绘樉绀烘爲
*/
@Override
- public List<Tree> referTree(TreeQueryObject treeQueryObject) {
+ public List<Tree> referTree(TreeQueryObject treeQueryObject) throws ServiceException{
if(treeQueryObject == null){
treeQueryObject = new TreeQueryObject();
}
@@ -520,7 +520,7 @@
if(treeQueryObject.getConditionMap().containsKey(LC_STATUS)) {
treeQueryObject.getConditionMap().remove(LC_STATUS);
}
- if(treeQueryObject.getExtandParamsMap() ==null || !treeQueryObject.getExtandParamsMap().containsKey(REFER_SHOW_DISABLED_QUERY_KEY)) {
+ if(treeQueryObject.getExtandParamsMap() == null || !treeQueryObject.getExtandParamsMap().containsKey(REFER_SHOW_DISABLED_QUERY_KEY)) {
}
treeQueryObject.getConditionMap().put(LC_STATUS, FRAMEWORK_DATA_ENABLED);
return treeCodeClassify(treeQueryObject);
@@ -550,7 +550,7 @@
* @return 涓婚搴撳垎绫� 鏄剧ず鏍�
*/
@Override
- public List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) {
+ public List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) throws ServiceException{
List<CodeClassify> doList = null;
String id = null;
String lcStatus = null;
@@ -597,10 +597,10 @@
}
}else {
// 閭ｄ簺鍒嗙被鍏峰鏌ョ湅鏉冮檺
- R<List<String>> viewClassByRoleIds = sysClient.getViewClassByRoleIds(Arrays.asList(AuthUtil.getUser().getRoleId().split(",")));
+ R<List<String>> viewClassByRoleIds = sysClient.getViewClassByRoleIds(Arrays.asList(AuthUtil.getUser().getRoleId().split(",")),treeQueryObject.getConditionMap().getOrDefault("authType","classify_auth"),treeQueryObject.getConditionMap().getOrDefault("menuCode","classify_view"));
// 璇锋眰澶辫触鎴栬�呰姹傚緱鍒扮殑鍏峰鏌ョ湅鏉冮檺鐨勫垎绫籭d闆嗗悎涓虹┖
- if(!viewClassByRoleIds.isSuccess() && !viewClassByRoleIds.getData().isEmpty()){
- return new ArrayList<>();
+ if(!viewClassByRoleIds.isSuccess() && viewClassByRoleIds.getData().isEmpty()){
+ throw new ServiceException("涓绘暟鎹煡鐪嬫潈闄愭湭閰嶇疆锛屾垨閰嶇疆鏈夎锛�");
}
// 杩囨护
filterTreeNodes(tree,viewClassByRoleIds.getData());
--
Gitblit v1.9.3