档案合集及历史记录按用户目录权限查看

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

@@ -3,6 +3,8 @@ package com.da.dangan.controller;
 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;
@@ -38,6 +40,13 @@ public class DaBirthDjController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(DaBirthDj daBirthDj)
     {
+        // 超管及角色为管理员显示所有目录信息
+        LoginUser loginUser = getLoginUser();
+        if (SysUser.isAdmin(getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+        }else{
+            daBirthDj.setUserId(getUserId());
+        }
         startPage();
         List<DaBirthDj> list = daBirthDjService.selectDaBirthDjList(daBirthDj);
         return getDataTable(list);

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

@@ -3,6 +3,8 @@ package com.da.dangan.controller;
 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;
@@ -25,19 +27,25 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/dangan/czrkdj")
-public class DaCzrkdjController extends BaseController
+public class DaCzrkdjController extends BaseController {
-{
     @Autowired
     private IDaCzrkdjService daCzrkdjService;
     @Autowired
     private IDaPicturesRecardService daPicturesRecardService;
+
     /**
      * 查询常住人口登记列表
      */
     @PreAuthorize("@ss.hasPermi('dangan:czrkdj:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DaCzrkdj daCzrkdj)
+    public TableDataInfo list(DaCzrkdj daCzrkdj) {
-    {
+        // 超管及角色为管理员显示所有目录信息
+        LoginUser loginUser = getLoginUser();
+        if (SysUser.isAdmin(getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+        }else{
+            daCzrkdj.setUserId(getUserId());
+        }
         startPage();
         List<DaCzrkdj> list = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj);
         return getDataTable(list);
@@ -49,8 +57,7 @@ public class DaCzrkdjController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:czrkdj:export')")
     @Log(title = "常住人口登记", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DaCzrkdj daCzrkdj)
+    public void export(HttpServletResponse response, DaCzrkdj daCzrkdj) {
-    {
         List<DaCzrkdj> list = daCzrkdjService.selectDaCzrkdjList(daCzrkdj);
         ExcelUtil<DaCzrkdj> util = new ExcelUtil<DaCzrkdj>(DaCzrkdj.class);
         util.exportExcel(response, list, "常住人口登记数据");
@@ -61,12 +68,11 @@ public class DaCzrkdjController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:czrkdj:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
-    {
         return success(daCzrkdjService.selectDaCzrkdjById(id));
     }
 
-/*    *//**
+    /*    *//**
      * 新增常住人口登记
      *//*
     @PreAuthorize("@ss.hasPermi('dangan:czrkdj:add')")
@@ -83,11 +89,10 @@ public class DaCzrkdjController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:czrkdj:add')")
     @Log(title = "常住人口登记", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody DaCzrkdj daCzrkdj)
+    public AjaxResult add(@RequestBody DaCzrkdj daCzrkdj) {
-    {
         String[] picIds = daCzrkdj.getPicIds().split(",");
-        if(picIds!=null&&picIds.length>0){
+        if (picIds != null && picIds.length > 0) {
-            for(String picid:picIds){
+            for (String picid : picIds) {
                 DaPicturesRecard picRecard = new DaPicturesRecard();
                 picRecard.setId(Long.parseLong(picid));
                 picRecard.setRecognize("1");
@@ -103,8 +108,7 @@ public class DaCzrkdjController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:czrkdj:edit')")
     @Log(title = "常住人口登记", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody DaCzrkdj daCzrkdj)
+    public AjaxResult edit(@RequestBody DaCzrkdj daCzrkdj) {
-    {
         return toAjax(daCzrkdjService.updateDaCzrkdj(daCzrkdj));
     }
 
@@ -113,9 +117,8 @@ public class DaCzrkdjController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:czrkdj:remove')")
     @Log(title = "常住人口登记", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    public AjaxResult remove(@PathVariable Long[] ids) {
-    {
         return toAjax(daCzrkdjService.deleteDaCzrkdjByIds(ids));
     }
 }

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

@@ -48,6 +48,7 @@ public class DaPicturesRecardController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(DaPicturesRecard daPicturesRecard)
     {
+        daPicturesRecard.setUserId(getUserId());
         startPage();
         List<DaPicturesRecard> list = daPicturesRecardService.selectDaPicturesRecardList(daPicturesRecard);
         return getDataTable(list);

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

@@ -1,25 +1,21 @@
 package com.da.dangan.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 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;
 import com.da.dangan.domain.DaQyz;
 import com.da.dangan.service.IDaQyzService;
-import com.da.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.da.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 迁移证Controller
@@ -29,8 +25,7 @@ import com.da.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/dangan/qyz")
-public class DaQyzController extends BaseController
+public class DaQyzController extends BaseController {
-{
     @Autowired
     private IDaQyzService daQyzService;
 
@@ -39,8 +34,14 @@ public class DaQyzController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:qyz:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DaQyz daQyz)
+    public TableDataInfo list(DaQyz daQyz) {
-    {
+        // 超管及角色为管理员显示所有目录信息
+        LoginUser loginUser = getLoginUser();
+        if (SysUser.isAdmin(getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+        }else{
+            daQyz.setUserId(getUserId());
+        }
         startPage();
         List<DaQyz> list = daQyzService.selectDaQyzList(daQyz);
         return getDataTable(list);
@@ -52,8 +53,7 @@ public class DaQyzController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:qyz:export')")
     @Log(title = "迁移证", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DaQyz daQyz)
+    public void export(HttpServletResponse response, DaQyz daQyz) {
-    {
         List<DaQyz> list = daQyzService.selectDaQyzList(daQyz);
         ExcelUtil<DaQyz> util = new ExcelUtil<DaQyz>(DaQyz.class);
         util.exportExcel(response, list, "迁移证数据");
@@ -64,8 +64,7 @@ public class DaQyzController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:qyz:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
-    {
         return success(daQyzService.selectDaQyzById(id));
     }
 
@@ -75,8 +74,7 @@ public class DaQyzController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:qyz:add')")
     @Log(title = "迁移证", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody DaQyz daQyz)
+    public AjaxResult add(@RequestBody DaQyz daQyz) {
-    {
         return toAjax(daQyzService.insertDaQyz(daQyz));
     }
 
@@ -86,8 +84,7 @@ public class DaQyzController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:qyz:edit')")
     @Log(title = "迁移证", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody DaQyz daQyz)
+    public AjaxResult edit(@RequestBody DaQyz daQyz) {
-    {
         return toAjax(daQyzService.updateDaQyz(daQyz));
     }
 
@@ -96,9 +93,8 @@ public class DaQyzController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:qyz:remove')")
     @Log(title = "迁移证", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    public AjaxResult remove(@PathVariable Long[] ids) {
-    {
         return toAjax(daQyzService.deleteDaQyzByIds(ids));
     }
 }

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

@@ -79,13 +79,13 @@ public class DaUserCatalogController extends BaseController
     /**
      * 修改用户目录关联
      */
-    @PreAuthorize("@ss.hasPermi('dangan:userMuRelation:edit')")
+/*    @PreAuthorize("@ss.hasPermi('dangan:userMuRelation:edit')")
     @Log(title = "用户目录关联", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DaUserCatalog daUserCatalog)
     {
         return toAjax(daUserCatalogService.updateDaUserCatalog(daUserCatalog));
-    }
+    }*/
 
     /**
      * 修改用户的档案目录权限
@@ -101,7 +101,7 @@ public class DaUserCatalogController extends BaseController
         {
             try {
                 //根据userId删除数据
-                int result = daUserCatalogService.deleteDaUserCatalogByUserId(daUserCatalog.getUserId());
+                daUserCatalogService.deleteDaUserCatalogByUserId(daUserCatalog.getUserId());
                 //根据userId添加数据
                 for(Long muId: muIds){
                     daUserCatalog.setMuId(muId);

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

@@ -3,6 +3,8 @@ package com.da.dangan.controller;
 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;
@@ -23,8 +25,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/dangan/ytzm")
-public class DaYtzmController extends BaseController
+public class DaYtzmController extends BaseController {
-{
     @Autowired
     private IDaYtzmService daYtzmService;
 
@@ -33,8 +34,14 @@ public class DaYtzmController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:ytzm:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DaYtzm daYtzm)
+    public TableDataInfo list(DaYtzm daYtzm) {
-    {
+        // 超管及角色为管理员显示所有目录信息
+        LoginUser loginUser = getLoginUser();
+        if (SysUser.isAdmin(getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+        }else{
+            daYtzm.setUserId(getUserId());
+        }
         startPage();
         List<DaYtzm> list = daYtzmService.selectDaYtzmList(daYtzm);
         return getDataTable(list);
@@ -46,8 +53,7 @@ public class DaYtzmController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:ytzm:export')")
     @Log(title = "一胎证明", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DaYtzm daYtzm)
+    public void export(HttpServletResponse response, DaYtzm daYtzm) {
-    {
         List<DaYtzm> list = daYtzmService.selectDaYtzmList(daYtzm);
         ExcelUtil<DaYtzm> util = new ExcelUtil<DaYtzm>(DaYtzm.class);
         util.exportExcel(response, list, "一胎证明数据");
@@ -58,8 +64,7 @@ public class DaYtzmController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:ytzm:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
-    {
         return success(daYtzmService.selectDaYtzmById(id));
     }
 
@@ -69,8 +74,7 @@ public class DaYtzmController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:ytzm:add')")
     @Log(title = "一胎证明", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody DaYtzm daYtzm)
+    public AjaxResult add(@RequestBody DaYtzm daYtzm) {
-    {
         return toAjax(daYtzmService.insertDaYtzm(daYtzm));
     }
 
@@ -80,8 +84,7 @@ public class DaYtzmController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:ytzm:edit')")
     @Log(title = "一胎证明", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody DaYtzm daYtzm)
+    public AjaxResult edit(@RequestBody DaYtzm daYtzm) {
-    {
         return toAjax(daYtzmService.updateDaYtzm(daYtzm));
     }
 
@@ -90,9 +93,8 @@ public class DaYtzmController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:ytzm:remove')")
     @Log(title = "一胎证明", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    public AjaxResult remove(@PathVariable Long[] ids) {
-    {
         return toAjax(daYtzmService.deleteDaYtzmByIds(ids));
     }
 }

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

@@ -1,25 +1,21 @@
 package com.da.dangan.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 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;
 import com.da.dangan.domain.DaZfnyhkcg;
 import com.da.dangan.service.IDaZfnyhkcgService;
-import com.da.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.da.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 转非农业人口批复存根Controller
@@ -29,8 +25,7 @@ import com.da.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/dangan/zfnyhkcg")
-public class DaZfnyhkcgController extends BaseController
+public class DaZfnyhkcgController extends BaseController {
-{
     @Autowired
     private IDaZfnyhkcgService daZfnyhkcgService;
 
@@ -39,8 +34,14 @@ public class DaZfnyhkcgController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:zfnyhkcg:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DaZfnyhkcg daZfnyhkcg)
+    public TableDataInfo list(DaZfnyhkcg daZfnyhkcg) {
-    {
+        // 超管及角色为管理员显示所有目录信息
+        LoginUser loginUser = getLoginUser();
+        if (SysUser.isAdmin(getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+        }else{
+            daZfnyhkcg.setUserId(getUserId());
+        }
         startPage();
         List<DaZfnyhkcg> list = daZfnyhkcgService.selectDaZfnyhkcgList(daZfnyhkcg);
         return getDataTable(list);
@@ -52,8 +53,7 @@ public class DaZfnyhkcgController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:zfnyhkcg:export')")
     @Log(title = "转非农业人口批复存根", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DaZfnyhkcg daZfnyhkcg)
+    public void export(HttpServletResponse response, DaZfnyhkcg daZfnyhkcg) {
-    {
         List<DaZfnyhkcg> list = daZfnyhkcgService.selectDaZfnyhkcgList(daZfnyhkcg);
         ExcelUtil<DaZfnyhkcg> util = new ExcelUtil<DaZfnyhkcg>(DaZfnyhkcg.class);
         util.exportExcel(response, list, "转非农业人口批复存根数据");
@@ -64,8 +64,7 @@ public class DaZfnyhkcgController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:zfnyhkcg:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
-    {
         return success(daZfnyhkcgService.selectDaZfnyhkcgById(id));
     }
 
@@ -75,8 +74,7 @@ public class DaZfnyhkcgController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:zfnyhkcg:add')")
     @Log(title = "转非农业人口批复存根", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody DaZfnyhkcg daZfnyhkcg)
+    public AjaxResult add(@RequestBody DaZfnyhkcg daZfnyhkcg) {
-    {
         return toAjax(daZfnyhkcgService.insertDaZfnyhkcg(daZfnyhkcg));
     }
 
@@ -86,8 +84,7 @@ public class DaZfnyhkcgController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:zfnyhkcg:edit')")
     @Log(title = "转非农业人口批复存根", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody DaZfnyhkcg daZfnyhkcg)
+    public AjaxResult edit(@RequestBody DaZfnyhkcg daZfnyhkcg) {
-    {
         return toAjax(daZfnyhkcgService.updateDaZfnyhkcg(daZfnyhkcg));
     }
 
@@ -96,9 +93,8 @@ public class DaZfnyhkcgController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:zfnyhkcg:remove')")
     @Log(title = "转非农业人口批复存根", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    public AjaxResult remove(@PathVariable Long[] ids) {
-    {
         return toAjax(daZfnyhkcgService.deleteDaZfnyhkcgByIds(ids));
     }
 }

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

@@ -1,25 +1,21 @@
 package com.da.dangan.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 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;
 import com.da.dangan.domain.DaZqz;
 import com.da.dangan.service.IDaZqzService;
-import com.da.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.da.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 准迁证Controller
@@ -29,8 +25,7 @@ import com.da.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/dangan/zqz")
-public class DaZqzController extends BaseController
+public class DaZqzController extends BaseController {
-{
     @Autowired
     private IDaZqzService daZqzService;
 
@@ -39,8 +34,14 @@ public class DaZqzController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:zqz:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DaZqz daZqz)
+    public TableDataInfo list(DaZqz daZqz) {
-    {
+        // 超管及角色为管理员显示所有目录信息
+        LoginUser loginUser = getLoginUser();
+        if (SysUser.isAdmin(getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+        }else{
+            daZqz.setUserId(getUserId());
+        }
         startPage();
         List<DaZqz> list = daZqzService.selectDaZqzList(daZqz);
         return getDataTable(list);
@@ -52,8 +53,7 @@ public class DaZqzController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:zqz:export')")
     @Log(title = "准迁证", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DaZqz daZqz)
+    public void export(HttpServletResponse response, DaZqz daZqz) {
-    {
         List<DaZqz> list = daZqzService.selectDaZqzList(daZqz);
         ExcelUtil<DaZqz> util = new ExcelUtil<DaZqz>(DaZqz.class);
         util.exportExcel(response, list, "准迁证数据");
@@ -64,8 +64,7 @@ public class DaZqzController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:zqz:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
-    {
         return success(daZqzService.selectDaZqzById(id));
     }
 
@@ -75,8 +74,7 @@ public class DaZqzController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:zqz:add')")
     @Log(title = "准迁证", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody DaZqz daZqz)
+    public AjaxResult add(@RequestBody DaZqz daZqz) {
-    {
         return toAjax(daZqzService.insertDaZqz(daZqz));
     }
 
@@ -86,8 +84,7 @@ public class DaZqzController extends BaseController
     @PreAuthorize("@ss.hasPermi('dangan:zqz:edit')")
     @Log(title = "准迁证", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody DaZqz daZqz)
+    public AjaxResult edit(@RequestBody DaZqz daZqz) {
-    {
         return toAjax(daZqzService.updateDaZqz(daZqz));
     }
 
@@ -96,9 +93,8 @@ public class DaZqzController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:zqz:remove')")
     @Log(title = "准迁证", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    public AjaxResult remove(@PathVariable Long[] ids) {
-    {
         return toAjax(daZqzService.deleteDaZqzByIds(ids));
     }
 }

dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java

@@ -219,6 +219,19 @@ public class DaBirthDj extends BaseEntity {
     @Excel(name = "审核原由")
     private String auditReason;
 
+    /**
+     * 当前用户id
+     */
+    private Long userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public void setId(Long id) {
         this.id = id;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java

@@ -300,6 +300,18 @@ public class DaCzrkdj extends BaseEntity {
     @Excel(name = "审核原由")
     private String auditReason;
 
+    /**
+     * 当前用户id
+     */
+    private Long userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
     public void setId(Long id) {
         this.id = id;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java

@@ -58,6 +58,19 @@ public class DaPicturesRecard extends BaseEntity
     @Excel(name = "是否纠错(字典0否1是)")
     private String errorCorrect;
 
+    /**
+     * 当前用户id
+     */
+    private Long userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public String getErrorCorrect() {
         return errorCorrect;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java

@@ -219,6 +219,19 @@ public class DaQyz extends BaseEntity {
     @Excel(name = "审核原由")
     private String auditReason;
 
+    /**
+     * 当前用户id
+     */
+    private Long userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public void setId(Long id) {
         this.id = id;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java

@@ -195,6 +195,19 @@ public class DaYtzm extends BaseEntity {
     @Excel(name = "审核原由")
     private String auditReason;
 
+    /**
+     * 当前用户id
+     */
+    private Long userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public void setId(Long id) {
         this.id = id;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java

@@ -231,6 +231,19 @@ public class DaZfnyhkcg extends BaseEntity {
     @Excel(name = "审核原由")
     private String auditReason;
 
+    /**
+     * 当前用户id
+     */
+    private Long userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public void setId(Long id) {
         this.id = id;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java

@@ -198,6 +198,19 @@ public class DaZqz extends BaseEntity
     @Excel(name = "审核原由")
     private String auditReason;
 
+    /**
+     * 当前用户id
+     */
+    private Long userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml

@@ -49,10 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDaBirthDjList" parameterType="DaBirthDj" resultMap="DaBirthDjResult">
-        <include refid="selectDaBirthDjVo"/>
+        select distinct b.* from da_birth_dj b
+        left join da_user_catalog uc on b.mu_id = uc.mu_id
         <where>
+            <if test="userId != null  "> and uc.user_id = #{userId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
-            <if test="muId != null "> and mu_id = #{muId}</if>
+            <if test="muId != null "> and b.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
             <if test="birthNum != null  and birthNum != ''"> and birth_num = #{birthNum}</if>
             <if test="name != null  and name != ''">

dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml

@@ -63,10 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
-        <include refid="selectDaCzrkdjVo"/>
+        select  distinct c.* from da_czrkdj c
+        left join da_user_catalog uc on c.mu_id = uc.mu_id
         <where>
+            <if test="userId != null  "> and uc.user_id = #{userId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
-            <if test="muId != null "> and mu_id = #{muId}</if>
+            <if test="muId != null "> and c.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
             <if test="relation != null  and relation != ''"> and relation = #{relation}</if>
             <if test="name != null  and name != ''">
@@ -121,10 +123,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectDaCzrkdjList1" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
-        <include refid="selectDaCzrkdjVo"/>
+        select distinct  c.* from da_czrkdj c
+        left join da_user_catalog uc on c.mu_id = uc.mu_id
         <where>
+            <if test="userId != null  "> and uc.user_id = #{userId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
-            <if test="muId != null "> and mu_id = #{muId}</if>
+            <if test="muId != null "> and c.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
             <if test="name != null  and name != ''">
              and ( name like concat('%', #{name}, '%')

dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml

@@ -28,13 +28,15 @@
     </sql>
 
     <select id="selectDaPicturesRecardList" parameterType="DaPicturesRecard" resultMap="DaPicturesRecardResult">
-        <include refid="selectDaPicturesRecardVo"/>
+        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="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>
             <if test="wlsjPath != null  and wlsjPath != ''"> and wlsj_path = #{wlsjPath}</if>
-            <if test="muId != null "> and mu_id = #{muId}</if>
+            <if test="muId != null "> and p.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
             <if test="daJlId != null "> and da_jl_id = #{daJlId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml

@@ -50,10 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDaQyzList" parameterType="DaQyz" resultMap="DaQyzResult">
-        <include refid="selectDaQyzVo"/>
+        select distinct  q.* from da_qyz q
+        left join da_user_catalog uc on q.mu_id = uc.mu_id
         <where>
+            <if test="userId != null"> and uc.user_id = #{userId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
-            <if test="muId != null "> and mu_id = #{muId}</if>
+            <if test="muId != null "> and q.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
             <if test="fwUnit != null  and fwUnit != ''"> and fw_unit = #{fwUnit}</if>
             <if test="wjXh != null  and wjXh != ''"> and wj_xh = #{wjXh}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml

@@ -46,10 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDaYtzmList" parameterType="DaYtzm" resultMap="DaYtzmResult">
-        <include refid="selectDaYtzmVo"/>
+        select distinct  y.* from da_ytzm y
+        left join da_user_catalog uc on y.mu_id = uc.mu_id
         <where>
+            <if test="userId != null  "> and uc.user_id = #{userId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
-            <if test="muId != null "> and mu_id = #{muId}</if>
+            <if test="muId != null "> and y.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
             <if test="year != null  and year != ''"> and year = #{year}</if>
             <if test="xh != null  and xh != ''"> and xh = #{xh}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml

@@ -52,10 +52,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDaZfnyhkcgList" parameterType="DaZfnyhkcg" resultMap="DaZfnyhkcgResult">
-        <include refid="selectDaZfnyhkcgVo"/>
+        select distinct  z.* from da_zfnyhkcg z
+        left join da_user_catalog uc on z.mu_id = uc.mu_id
         <where>
+            <if test="userId != null "> and uc.user_id = #{userId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
-            <if test="muId != null "> and mu_id = #{muId}</if>
+            <if test="muId != null "> and z.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
             <if test="num != null  and num != ''"> and num = #{num}</if>
             <if test="name != null  and name != ''">

dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml

@@ -61,10 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDaZqzList" parameterType="DaZqz" resultMap="DaZqzResult">
-        <include refid="selectDaZqzVo"/>
+        select distinct z.* from da_zqz z
+        left join da_user_catalog uc on z.mu_id = uc.mu_id
         <where>
+            <if test="userId != null  "> and uc.user_id = #{userId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
-            <if test="muId != null "> and mu_id = #{muId}</if>
+            <if test="muId != null "> and z.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
             <if test="num != null  and num != ''"> and num = #{num}</if>
             <if test="name != null  and name != ''">