From d7f84d489282b0f3e61933bbb2df91aef5fab151 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 15 六月 2025 02:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysSensitiveWordsController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysSensitiveWordsController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysSensitiveWordsController.java
index e5b3281..a98ed1c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysSensitiveWordsController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysSensitiveWordsController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
@@ -65,10 +66,10 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (ShiroKit.getUser().getRoleType() != 1){
+ if (ShiroExtUtil.getUser().getRoleType() != 1) {
page.setRecords(null);
- }else{
- page.setRecords(tSysSensitiveWordsService.getSensitiveWordList(page,beginTime,endTime,content));
+ } else {
+ page.setRecords(tSysSensitiveWordsService.getSensitiveWordList(page, beginTime, endTime, content));
}
return super.packForBT(page);
}
--
Gitblit v1.7.1