From a5139ea98b57088938342dc99cdbda6615e35352 Mon Sep 17 00:00:00 2001 From: hansha Date: Sat, 22 Jun 2024 20:47:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=90=88=E9=9B=86?= =?UTF-8?q?=E5=8F=8A=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=8C=89=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9B=AE=E5=BD=95=E6=9D=83=E9=99=90=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DaBirthDjController.java | 9 +++ .../dangan/controller/DaCzrkdjController.java | 41 +++++++------- .../DaPicturesRecardController.java | 1 + .../da/dangan/controller/DaQyzController.java | 56 +++++++++---------- .../controller/DaUserCatalogController.java | 6 +- .../dangan/controller/DaYtzmController.java | 34 +++++------ .../controller/DaZfnyhkcgController.java | 56 +++++++++---------- .../da/dangan/controller/DaZqzController.java | 56 +++++++++---------- .../java/com/da/dangan/domain/DaBirthDj.java | 13 +++++ .../java/com/da/dangan/domain/DaCzrkdj.java | 12 ++++ .../da/dangan/domain/DaPicturesRecard.java | 13 +++++ .../main/java/com/da/dangan/domain/DaQyz.java | 13 +++++ .../java/com/da/dangan/domain/DaYtzm.java | 13 +++++ .../java/com/da/dangan/domain/DaZfnyhkcg.java | 13 +++++ .../main/java/com/da/dangan/domain/DaZqz.java | 13 +++++ .../mapper/dangan/DaBirthDjMapper.xml | 8 ++- .../mapper/dangan/DaCzrkdjMapper.xml | 12 ++-- .../mapper/dangan/DaPicturesRecardMapper.xml | 6 +- .../resources/mapper/dangan/DaQyzMapper.xml | 8 ++- .../resources/mapper/dangan/DaYtzmMapper.xml | 8 ++- .../mapper/dangan/DaZfnyhkcgMapper.xml | 8 ++- .../resources/mapper/dangan/DaZqzMapper.xml | 8 ++- 22 files changed, 258 insertions(+), 149 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaBirthDjController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaBirthDjController.java index 9c962c1..399e67c 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaBirthDjController.java +++ b/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 list = daBirthDjService.selectDaBirthDjList(daBirthDj); return getDataTable(list); diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java index cd0acca..1f7c2c5 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java +++ b/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; @@ -19,25 +21,31 @@ import java.util.List; /** * 常住人口登记Controller - * + * * @author hs * @date 2024-05-08 */ @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 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 list = daCzrkdjService.selectDaCzrkdjList(daCzrkdj); ExcelUtil util = new ExcelUtil(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){ - for(String picid:picIds){ + if (picIds != null && picIds.length > 0) { + 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}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(daCzrkdjService.deleteDaCzrkdjByIds(ids)); } } 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 7e702bf..67a5e87 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 @@ -48,6 +48,7 @@ public class DaPicturesRecardController extends BaseController @GetMapping("/list") public TableDataInfo list(DaPicturesRecard daPicturesRecard) { + daPicturesRecard.setUserId(getUserId()); startPage(); List list = daPicturesRecardService.selectDaPicturesRecardList(daPicturesRecard); return getDataTable(list); diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaQyzController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaQyzController.java index 10c5fcd..c1c730f 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaQyzController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaQyzController.java @@ -1,36 +1,31 @@ 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 com.da.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 迁移证Controller - * + * * @author hs * @date 2024-06-14 */ @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 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 list = daQyzService.selectDaQyzList(daQyz); ExcelUtil util = new ExcelUtil(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}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(daQyzService.deleteDaQyzByIds(ids)); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaUserCatalogController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaUserCatalogController.java index cade383..084d349 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaUserCatalogController.java +++ b/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); diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaYtzmController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaYtzmController.java index 99a5ad9..5ebc688 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaYtzmController.java +++ b/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; @@ -17,14 +19,13 @@ import java.util.List; /** * 一胎证明Controller - * + * * @author hs * @date 2024-06-14 */ @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 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 list = daYtzmService.selectDaYtzmList(daYtzm); ExcelUtil util = new ExcelUtil(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}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(daYtzmService.deleteDaYtzmByIds(ids)); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaZfnyhkcgController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaZfnyhkcgController.java index ee9b1b0..618eb64 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaZfnyhkcgController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaZfnyhkcgController.java @@ -1,36 +1,31 @@ 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 com.da.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 转非农业人口批复存根Controller - * + * * @author hs * @date 2024-06-14 */ @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 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 list = daZfnyhkcgService.selectDaZfnyhkcgList(daZfnyhkcg); ExcelUtil util = new ExcelUtil(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}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(daZfnyhkcgService.deleteDaZfnyhkcgByIds(ids)); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaZqzController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaZqzController.java index b99adad..be88919 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaZqzController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaZqzController.java @@ -1,36 +1,31 @@ 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 com.da.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 准迁证Controller - * + * * @author hs * @date 2024-06-14 */ @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 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 list = daZqzService.selectDaZqzList(daZqz); ExcelUtil util = new ExcelUtil(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}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(daZqzService.deleteDaZqzByIds(ids)); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java index 145d546..463eaa9 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java index 3e56ad5..7c96782 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java index 4b4fb94..c94a622 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java index f08a852..2b1a8f8 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java index 47f21ff..2448119 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java index add1370..c09228f 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java index 2e2f6a9..af752e3 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java +++ b/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; diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml index 750b9f6..c5c0b77 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml @@ -49,10 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select distinct c.* from da_czrkdj c + left join da_user_catalog uc on c.mu_id = uc.mu_id + and uc.user_id = #{userId} and yw_type = #{ywType} - and mu_id = #{muId} + and c.mu_id = #{muId} and mu_path = #{muPath} and relation = #{relation} @@ -121,10 +123,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + 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 pic_name like concat('%', #{picName}, '%') and pic_url = #{picUrl} and wlsj_id = #{wlsjId} and wlsj_path = #{wlsjPath} - and mu_id = #{muId} + and p.mu_id = #{muId} and mu_path = #{muPath} and da_jl_id = #{daJlId} and yw_type = #{ywType} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml index 2de85fd..ecd2bcf 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml @@ -50,10 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + select distinct y.* from da_ytzm y + left join da_user_catalog uc on y.mu_id = uc.mu_id + + and uc.user_id = #{userId} and yw_type = #{ywType} - and mu_id = #{muId} + and y.mu_id = #{muId} and mu_path = #{muPath} and year = #{year} and xh = #{xh} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml index 2946ef9..8f61ace 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml @@ -52,10 +52,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + select distinct z.* from da_zqz z + left join da_user_catalog uc on z.mu_id = uc.mu_id + + and uc.user_id = #{userId} and yw_type = #{ywType} - and mu_id = #{muId} + and z.mu_id = #{muId} and mu_path = #{muPath} and num = #{num} From 89ed14fb4475331ebff15c9175165560f8b172d1 Mon Sep 17 00:00:00 2001 From: hansha Date: Sat, 22 Jun 2024 20:49:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/da/dangan/service/impl/DaCatalogServiceImpl.java | 4 ++-- .../src/main/resources/mapper/dangan/DaCatalogMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java index e743364..b475c8d 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java @@ -101,8 +101,8 @@ public class DaCatalogServiceImpl implements IDaCatalogService @Override public List selectDaCatalogList(DaCatalog daCatalog, LoginUser loginUser) { - List catalogList = null; - // 超管及管理员显示所有目录信息 + List catalogList; + // 超管及角色为管理员显示所有目录信息 if (SysUser.isAdmin(loginUser.getUserId())|| loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml index 36a9442..5c51b44 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml @@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by c.pid, c.order_num - + - + select distinct t.* from da_task t + left join da_user_catalog uc on t.mu_id = uc.mu_id - and mu_id = #{muId} + and uc.user_id = #{userId} + and t.mu_id = #{muId} and yw_type = #{ywType} and pic_ids = #{picIds} and num = #{num} From 6d6acd8f67bc6ed409422599058fb361f190e7b2 Mon Sep 17 00:00:00 2001 From: hansha Date: Sat, 22 Jun 2024 22:07:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/da/dangan/controller/DaCatalogController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java index 029d2d7..371373d 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java @@ -54,8 +54,10 @@ public class DaCatalogController extends BaseController @GetMapping(value = "/userMenuTreeselect/{userId}") public AjaxResult roleMenuTreeselect(@PathVariable("userId") Long userId) { - //根据用户查询对应列表 - List catalogs = daCatalogService.selectDaCatalogList(new DaCatalog(), getLoginUser()); + //查询所有目录列表 + List catalogs = daCatalogService.selectAllDaCatalogList(new DaCatalog()); + //查询当前用户权限内的目录 + // List catalogs = daCatalogService.selectDaCatalogList(new DaCatalog(), getLoginUser()); AjaxResult ajax = AjaxResult.success(); ajax.put("checkedKeys", daCatalogService.selectCatalogIdsByUserId(userId)); ajax.put("catalogs", daCatalogService.buildCatalogTreeSelect(catalogs));