From 83415cfdd58de2ce95b874cc1be9bc5112b8baa2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 19:46:22 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java
index f5aa9d1..acf8ca2 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java
@@ -104,7 +104,14 @@
Integer objectId = ShiroKit.getUser().getObjectId();
Integer roleType = ShiroKit.getUser().getRoleType();
if(roleType == 1){
- List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
+ List<TBranchOffice> branchOffices = branchOfficeService.selectList(new EntityWrapper<TBranchOffice>().eq("status", 1));
+ List<Integer> collect = new ArrayList<>();
+ if(branchOffices.size() == 0){
+ collect.add(-1);
+ }else{
+ collect = branchOffices.stream().map(TBranchOffice::getId).collect(Collectors.toList());
+ }
+ List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>().in("branchOfficeId", collect));
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
model.addAttribute("provinceList",new ArrayList<>());
}
--
Gitblit v1.7.1