From 339515558253d776769dc2e2560bbb4a0450c989 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 29 十一月 2024 09:44:44 +0800
Subject: [PATCH] 将码云版本提交至gitlab -- 20241129
---
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
old mode 100644
new mode 100755
index 963ed0b..939bc66
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
@@ -87,7 +87,7 @@
LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>();
query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0);
query.orderByAsc(SysPermission::getSortNo);
-
+
//鏀寔閫氳繃鑿滃崟鍚嶅瓧锛屾ā绯婃煡璇�
if(oConvertUtils.isNotEmpty(sysPermission.getName())){
query.like(SysPermission::getName, sysPermission.getName());
@@ -211,7 +211,7 @@
// /**
// * 鏌ヨ鐢ㄦ埛鎷ユ湁鐨勮彍鍗曟潈闄愬拰鎸夐挳鏉冮檺锛堟牴鎹敤鎴疯处鍙凤級
-// *
+// *
// * @return
// */
// @RequestMapping(value = "/queryByUser", method = RequestMethod.GET)
@@ -250,8 +250,8 @@
//娣诲姞棣栭〉璺敱
//update-begin-author:taoyan date:20200211 for: TASK #3368 銆愯矾鐢辩紦瀛樸�戦椤电殑缂撳瓨璁剧疆鏈夐棶棰橈紝闇�瑕佹牴鎹悗鍙扮殑璺敱閰嶇疆鏉ュ疄鐜版槸鍚︾紦瀛�
if(!PermissionDataUtil.hasIndexPage(metaList)){
- SysPermission indexMenu = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getName,"棣栭〉")).get(0);
- metaList.add(0,indexMenu);
+// SysPermission indexMenu = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getName,"棣栭〉")).get(0);
+// metaList.add(0,indexMenu);
}
//update-end-author:taoyan date:20200211 for: TASK #3368 銆愯矾鐢辩紦瀛樸�戦椤电殑缂撳瓨璁剧疆鏈夐棶棰橈紝闇�瑕佹牴鎹悗鍙扮殑璺敱閰嶇疆鏉ュ疄鐜版槸鍚︾紦瀛�
@@ -277,7 +277,7 @@
}
//update-end---author:liusq ---date:2022-06-29 for锛氳缃嚜瀹氫箟棣栭〉鍦板潃鍜岀粍浠�-----------
}
-
+
JSONObject json = new JSONObject();
JSONArray menujsonArray = new JSONArray();
this.getPermissionJsonArray(menujsonArray, metaList, null);
@@ -303,7 +303,7 @@
json.put("sysSafeMode", jeecgBaseConfig.getSafeMode());
result.setResult(json);
} catch (Exception e) {
- result.error500("鏌ヨ澶辫触:" + e.getMessage());
+ result.error500("鏌ヨ澶辫触:" + e.getMessage());
log.error(e.getMessage(), e);
}
return result;
--
Gitblit v1.9.3