不限制sysAdmin档案目录管理权限

dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java

@@ -34,7 +34,7 @@ public class DaCatalogController extends BaseController
     @GetMapping("/list")
     public AjaxResult list(DaCatalog daCatalog)
     {
-        List<DaCatalog> catalogs = daCatalogService.selectAllDaCatalogList(daCatalog, getUserId());
+        List<DaCatalog> catalogs = daCatalogService.selectDaCatalogList(daCatalog, getLoginUser());
         return success(catalogs);
     }
 
@@ -44,7 +44,7 @@ public class DaCatalogController extends BaseController
     @GetMapping("/treeselect")
     public AjaxResult treeselect(DaCatalog daCatalog)
     {
-        List<DaCatalog> daCatalogs = daCatalogService.selectDaCatalogList(daCatalog);
+        List<DaCatalog> daCatalogs = daCatalogService.selectAllDaCatalogList(daCatalog);
         return success(daCatalogService.buildCatalogTreeSelect(daCatalogs));
     }
 
@@ -53,10 +53,9 @@ public class DaCatalogController extends BaseController
      */
     @GetMapping(value = "/userMenuTreeselect/{userId}")
     public AjaxResult roleMenuTreeselect(@PathVariable("userId") Long userId)
-    {   /*根据用户查询对应列表
+    {
-        List<DaCatalog> catalogs = daCatalogService.selectCatalogList(getUserId());*/
+        //根据用户查询对应列表
-        //查询全部目录列表
+        List<DaCatalog> catalogs = daCatalogService.selectDaCatalogList(new DaCatalog(), getLoginUser());
-        List<DaCatalog> catalogs = daCatalogService.selectDaCatalogList(new DaCatalog());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", daCatalogService.selectCatalogIdsByUserId(userId));
         ajax.put("catalogs", daCatalogService.buildCatalogTreeSelect(catalogs));
@@ -71,7 +70,7 @@ public class DaCatalogController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, DaCatalog daCatalog)
     {
-        List<DaCatalog> list = daCatalogService.selectDaCatalogList(daCatalog);
+        List<DaCatalog> list = daCatalogService.selectDaCatalogList(daCatalog, getLoginUser());
         ExcelUtil<DaCatalog> util = new ExcelUtil<DaCatalog>(DaCatalog.class);
         util.exportExcel(response, list, "档案目录数据");
     }

dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java

@@ -113,17 +113,6 @@ public class DaPicturesRecardController extends BaseController
         return toAjax(daPicturesRecardService.updateDaPicturesRecard(daPicturesRecard));
     }
 
-    /**
-     * 删除档案图片信息记录
-     */
-    @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:remove')")
-    @Log(title = "档案图片信息记录", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable Long id)
-    {
-        return daPicturesRecardService.deleteDaPicturesRecardById(id);
-    }
-
     /**
      * 删除档案图片信息记录
      */
@@ -134,6 +123,7 @@ public class DaPicturesRecardController extends BaseController
     {
         return daPicturesRecardService.deleteDaPicturesRecardByIds(ids);
     }
+
     /**
      * 使用多线程打包下载
      */

dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java

@@ -3,6 +3,7 @@ package com.da.dangan.service;
 import com.da.common.core.domain.AjaxResult;
 import com.da.common.core.domain.TreeSelect;
 import com.da.common.core.domain.entity.DaCatalog;
+import com.da.common.core.domain.model.LoginUser;
 
 import java.util.List;
 
@@ -28,15 +29,7 @@ public interface IDaCatalogService
      * @param daCatalog 档案目录
      * @return 档案目录集合
      */
-    public List<DaCatalog> selectDaCatalogList(DaCatalog daCatalog);
+    public List<DaCatalog> selectDaCatalogList(DaCatalog daCatalog, LoginUser user);
-
-    /**
-     * 查询档案目录列表
-     *
-     * @param daCatalog 档案目录
-     * @return 档案目录集合
-     */
-    public List<DaCatalog> selectAllDaCatalogList(DaCatalog daCatalog, Long userId);
 
     /**
      * 新增档案目录
@@ -72,7 +65,6 @@ public interface IDaCatalogService
 
     boolean checkDaCatalogNameUnique(DaCatalog daCatalog);
     
-    List<DaCatalog> selectCatalogList(Long userId);
     /**
      * 构建前端所需要树结构
      * @param daCatalogs 目录列表
@@ -91,4 +83,5 @@ public interface IDaCatalogService
     List<Long> selectCatalogIdsByUserId(Long userId);
 
 
+    List<DaCatalog> selectAllDaCatalogList(DaCatalog daCatalog);
 }

dangan-dangan/src/main/java/com/da/dangan/service/IDaPicturesRecardService.java

@@ -53,11 +53,4 @@ public interface IDaPicturesRecardService
      */
     public AjaxResult deleteDaPicturesRecardByIds(Long[] ids);
 
-    /**
-     * 删除档案图片信息记录信息
-     * 
-     * @param id 档案图片信息记录主键
-     * @return 结果
-     */
-    public AjaxResult deleteDaPicturesRecardById(Long id);
 }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java

@@ -5,6 +5,7 @@ import com.da.common.core.domain.AjaxResult;
 import com.da.common.core.domain.TreeSelect;
 import com.da.common.core.domain.entity.DaCatalog;
 import com.da.common.core.domain.entity.SysUser;
+import com.da.common.core.domain.model.LoginUser;
 import com.da.common.exception.ServiceException;
 import com.da.common.utils.DateUtils;
 import com.da.common.utils.StringUtils;
@@ -81,39 +82,40 @@ public class DaCatalogServiceImpl implements IDaCatalogService
         return returnList;
     }
 
-
+    /**
+     * 查询所有目录列表
+     * @param daCatalog
+     * @return
+     */
     @Override
-    public List<DaCatalog> selectCatalogList(Long userId) {
+    public List<DaCatalog> selectAllDaCatalogList(DaCatalog daCatalog) {
-        return selectAllDaCatalogList(new DaCatalog(), userId);
+        return daCatalogMapper.selectDaCatalogList(daCatalog);
     }
+
     /**
-     * 查询档案目录列表
+     * 按用户权限查询档案目录列表
      *
      * @param daCatalog 档案目录
      * @return 档案目录
      */
     @Override
-    public List<DaCatalog> selectDaCatalogList(DaCatalog daCatalog)
+    public List<DaCatalog> selectDaCatalogList(DaCatalog daCatalog, LoginUser loginUser)
-    {
-        return daCatalogMapper.selectDaCatalogList(daCatalog);
-    }
-
-    @Override
-    public List<DaCatalog> selectAllDaCatalogList(DaCatalog daCatalog, Long userId)
     {
         List<DaCatalog> catalogList = null;
-        // 管理员显示所有目录信息
+        // 超管及管理员显示所有目录信息
-        if (SysUser.isAdmin(userId))
+        if (SysUser.isAdmin(loginUser.getUserId())||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin")))
         {
             catalogList = daCatalogMapper.selectDaCatalogList(daCatalog);
         }
         else
         {  //根据用户权限显示目录信息
-            daCatalog.getParams().put("userId", userId);
+            daCatalog.getParams().put("userId", loginUser.getUserId());
             catalogList = daCatalogMapper.selectDaCatalogListByUserId(daCatalog);
         }
         return catalogList;
     }
+
     /**
      * 新增档案目录
      * 

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaPicturesRecardServiceImpl.java

@@ -84,7 +84,7 @@ public class DaPicturesRecardServiceImpl implements IDaPicturesRecardService
         //判断图片是否已经被识别
         for(Long id:ids){
             DaPicturesRecard picturesRecard = daPicturesRecardMapper.selectDaPicturesRecardById(id);
-            if (picturesRecard!=null&&picturesRecard.getRecognize()!="0"){
+            if (picturesRecard!=null&&!picturesRecard.getRecognize().equals("0")){
                 return AjaxResult.error("只能删除未识别图片");
             }
         }
@@ -94,25 +94,4 @@ public class DaPicturesRecardServiceImpl implements IDaPicturesRecardService
         }
         return AjaxResult.error("系统错误！");
     }
-
-    /**
-     * 删除档案图片信息记录信息
-     * 
-     * @param id 档案图片信息记录主键
-     * @return 结果
-     */
-    @Override
-    public AjaxResult deleteDaPicturesRecardById(Long id)
-    {
-        //判断图片是否已经被识别
-        DaPicturesRecard picturesRecard = daPicturesRecardMapper.selectDaPicturesRecardById(id);
-        if (picturesRecard!=null&&picturesRecard.getRecognize()!="0"){
-           return AjaxResult.error("只能删除未识别图片");
-        }
-        int i = daPicturesRecardMapper.deleteDaPicturesRecardById(id);
-        if(i>0){
-            return AjaxResult.success();
-        }
-        return AjaxResult.error("系统错误！");
-    }
 }