From af41641e6cd79bbc89462fed3ca62cfb866883ec Mon Sep 17 00:00:00 2001 From: hansha Date: Sat, 22 Jun 2024 20:55:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=8C=89?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9B=AE=E5=BD=95=E6=9D=83=E9=99=90=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DaPicturesRecardController.java | 12 ++++++++++-- .../mapper/dangan/DaPicturesRecardMapper.xml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java index 67a5e87..065827c 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java @@ -4,6 +4,8 @@ import cn.hutool.core.util.URLUtil; import com.da.common.annotation.Log; import com.da.common.core.controller.BaseController; import com.da.common.core.domain.AjaxResult; +import com.da.common.core.domain.entity.SysUser; +import com.da.common.core.domain.model.LoginUser; import com.da.common.core.page.TableDataInfo; import com.da.common.enums.BusinessType; import com.da.common.utils.poi.ExcelUtil; @@ -22,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -48,7 +50,13 @@ public class DaPicturesRecardController extends BaseController @GetMapping("/list") public TableDataInfo list(DaPicturesRecard daPicturesRecard) { - daPicturesRecard.setUserId(getUserId()); + // 超管及角色为管理员显示所有目录信息 + LoginUser loginUser = getLoginUser(); + if (SysUser.isAdmin(getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + }else{ + daPicturesRecard.setUserId(getUserId()); + } startPage(); List list = daPicturesRecardService.selectDaPicturesRecardList(daPicturesRecard); return getDataTable(list); diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml index 676e6de..1c2eafb 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml @@ -31,7 +31,7 @@ select p.* from da_pictures_recard p left join da_user_catalog uc on p.mu_id = uc.mu_id - uc.user_id = #{userId} + and uc.user_id = #{userId} and pic_name like concat('%', #{picName}, '%') and pic_url = #{picUrl} and wlsj_id = #{wlsjId}