历史记录按用户目录权限查询bug修改

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)
     {
+        // 超管及角色为管理员显示所有目录信息
+        LoginUser loginUser = getLoginUser();
+        if (SysUser.isAdmin(getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+        }else{
             daPicturesRecard.setUserId(getUserId());
+        }
         startPage();
         List<DaPicturesRecard> list = daPicturesRecardService.selectDaPicturesRecardList(daPicturesRecard);
         return getDataTable(list);

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
         <where>
-            uc.user_id = #{userId}
+            <if test="userId != null"> and uc.user_id = #{userId}</if>
             <if test="picName != null  and picName != ''"> and pic_name like concat('%', #{picName}, '%')</if>
             <if test="picUrl != null  and picUrl != ''"> and pic_url = #{picUrl}</if>
             <if test="wlsjId != null "> and wlsj_id = #{wlsjId}</if>