From b740dc54f7fdfcbbea60887970848f3cbe6a46d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Fri, 20 Jun 2025 16:11:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=B0=8F=E5=8C=BA=E9=99=90?= =?UTF-8?q?=E5=88=B6=EF=BC=8C=E9=9D=9E=E8=B6=85=E7=AE=A1=E4=BB=85=E9=99=90?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=89=80=E5=9C=A8=E5=B0=8F=E5=8C=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/WxAccountController.java | 7 +++++ .../business/WxCarportController.java | 7 +++++ .../business/WxClockController.java | 7 +++++ .../business/WxCommentController.java | 7 +++++ .../business/WxCommonPhoneController.java | 9 +++++++ .../business/WxCommunityController.java | 4 +++ .../business/WxFamilyMemberController.java | 7 +++++ .../business/WxGuestController.java | 7 +++++ .../business/WxLiveBillController.java | 7 +++++ .../business/WxPayRecordController.java | 7 +++++ .../WxProprietorLedgerController.java | 10 +++++++ .../business/WxRepairsController.java | 7 +++++ .../controller/business/WxRuleController.java | 7 +++++ .../common/core/domain/entity/SysUser.java | 10 +++++++ .../common/core/domain/model/LoginUser.java | 5 ++++ .../system/service/SysLoginService.java | 1 + .../service/impl/SysUserServiceImpl.java | 1 + .../resources/mapper/system/SysUserMapper.xml | 6 ++++- .../src/views/business/account/index.vue | 10 ++++++- .../src/views/business/clock/index.vue | 10 ++++++- .../src/views/business/comment/index.vue | 10 ++++++- .../src/views/business/commonPhone/index.vue | 10 ++++++- .../src/views/business/community/index.vue | 16 ++++++------ .../src/views/business/familyMember/index.vue | 10 ++++++- .../src/views/business/guest/index.vue | 10 ++++++- .../src/views/business/liveBill/index.vue | 10 ++++++- .../src/views/business/payRecord/index.vue | 10 ++++++- .../views/business/proprietorLedger/index.vue | 10 ++++++- .../src/views/business/repairs/index.vue | 10 ++++++- .../src/views/business/rule/index.vue | 10 ++++++- .../src/views/system/user/index.vue | 26 +++++++++++++++++-- 31 files changed, 246 insertions(+), 22 deletions(-) diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxAccountController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxAccountController.java index 6e3342f..c33a53f 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxAccountController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxAccountController.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Arrays; import java.util.concurrent.TimeUnit; +import com.propertyManagement.common.helper.LoginHelper; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -45,6 +46,9 @@ public class WxAccountController extends BaseController { @SaCheckPermission("business:account:list") @GetMapping("/list") public TableDataInfo list(WxAccountBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxAccountService.queryPageList(bo, pageQuery); } @@ -55,6 +59,9 @@ public class WxAccountController extends BaseController { @Log(title = "员工账号", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxAccountBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxAccountService.queryList(bo); ExcelUtil.exportExcel(list, "员工账号", WxAccountVo.class, response); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCarportController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCarportController.java index 696f2fe..53917a4 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCarportController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCarportController.java @@ -18,6 +18,7 @@ import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; import com.propertyManagement.common.excel.ExcelResult; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; @@ -53,6 +54,9 @@ public class WxCarportController extends BaseController { @SaCheckPermission("business:carport:list") @GetMapping("/list") public TableDataInfo list(WxCarportBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxCarportService.queryPageList(bo, pageQuery); } @@ -75,6 +79,9 @@ public class WxCarportController extends BaseController { @Log(title = "业主车位", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxCarportBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxCarportService.queryList(bo); ExcelUtil.exportExcel(list, "业主车位", WxCarportVo.class, response); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxClockController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxClockController.java index 856e61d..e3a0806 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxClockController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxClockController.java @@ -21,6 +21,7 @@ import com.propertyManagement.common.core.page.TableDataInfo; import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -56,6 +57,9 @@ public class WxClockController extends BaseController { @SaCheckPermission("business:clock:list") @GetMapping("/list") public TableDataInfo list(WxClockBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxClockService.queryPageList(bo, pageQuery); } @@ -97,6 +101,9 @@ public class WxClockController extends BaseController { @Log(title = "打卡", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxClockBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxClockService.queryList(bo); ExcelUtil.exportExcel(list, "打卡", WxClockVo.class, response); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommentController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommentController.java index 6720ca2..b9ee7e8 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommentController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommentController.java @@ -16,6 +16,7 @@ import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; import com.propertyManagement.common.enums.RepairsState; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -49,6 +50,9 @@ public class WxCommentController extends BaseController { @SaCheckPermission("business:comment:list") @GetMapping("/list") public TableDataInfo list(WxCommentBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxCommentService.queryPageList(bo, pageQuery); } @@ -59,6 +63,9 @@ public class WxCommentController extends BaseController { @Log(title = "表扬与投诉", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxCommentBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxCommentService.queryList(bo); ExcelUtil.exportExcel(list, "表扬与投诉", WxCommentVo.class, response); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommonPhoneController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommonPhoneController.java index d732ed5..3dd5a43 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommonPhoneController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommonPhoneController.java @@ -9,12 +9,15 @@ import com.propertyManagement.common.annotation.RepeatSubmit; import com.propertyManagement.common.core.controller.BaseController; import com.propertyManagement.common.core.domain.PageQuery; import com.propertyManagement.common.core.domain.R; +import com.propertyManagement.common.core.domain.model.LoginUser; import com.propertyManagement.common.core.page.TableDataInfo; import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; +import org.springframework.util.function.SupplierUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -44,6 +47,9 @@ public class WxCommonPhoneController extends BaseController { @SaCheckPermission("business:commonPhone:list") @GetMapping("/list") public TableDataInfo list(WxCommonPhoneBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxCommonPhoneService.queryPageList(bo, pageQuery); } @@ -54,6 +60,9 @@ public class WxCommonPhoneController extends BaseController { @Log(title = "常用电话", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxCommonPhoneBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxCommonPhoneService.queryList(bo); ExcelUtil.exportExcel(list, "常用电话", WxCommonPhoneVo.class, response); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommunityController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommunityController.java index ca0d206..019e41f 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommunityController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCommunityController.java @@ -13,6 +13,7 @@ import com.propertyManagement.common.core.page.TableDataInfo; import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -44,6 +45,9 @@ public class WxCommunityController extends BaseController { @SaCheckPermission("business:community:list") @GetMapping("/list") public TableDataInfo list(WxCommunityBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxCommunityService.queryPageList(bo, pageQuery); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxFamilyMemberController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxFamilyMemberController.java index 5309943..db846de 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxFamilyMemberController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxFamilyMemberController.java @@ -13,6 +13,7 @@ import com.propertyManagement.common.core.page.TableDataInfo; import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -44,6 +45,9 @@ public class WxFamilyMemberController extends BaseController { @SaCheckPermission("business:familyMember:list") @GetMapping("/list") public TableDataInfo list(WxFamilyMemberBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxFamilyMemberService.queryPageList(bo, pageQuery); } @@ -53,6 +57,9 @@ public class WxFamilyMemberController extends BaseController { @SaCheckPermission("business:familyMember:list") @GetMapping("/listAll") public R> listAll(WxFamilyMemberBo bo) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return R.ok(iWxFamilyMemberService.queryList(bo)); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxGuestController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxGuestController.java index 2b493b8..1ea34b2 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxGuestController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxGuestController.java @@ -13,6 +13,7 @@ import com.propertyManagement.common.core.page.TableDataInfo; import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -44,6 +45,9 @@ public class WxGuestController extends BaseController { @SaCheckPermission("business:guest:list") @GetMapping("/list") public TableDataInfo list(WxGuestBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxGuestService.queryPageList(bo, pageQuery); } @@ -54,6 +58,9 @@ public class WxGuestController extends BaseController { @Log(title = "访客", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxGuestBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxGuestService.queryList(bo); ExcelUtil.exportExcel(list, "访客", WxGuestVo.class, response); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxLiveBillController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxLiveBillController.java index 75234c7..3ee540c 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxLiveBillController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxLiveBillController.java @@ -18,6 +18,7 @@ import com.propertyManagement.common.core.page.TableDataInfo; import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -51,6 +52,9 @@ public class WxLiveBillController extends BaseController { @SaCheckPermission("business:liveBill:list") @GetMapping("/list") public TableDataInfo list(WxLiveBillBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxLiveBillService.queryPageList(bo, pageQuery); } @@ -61,6 +65,9 @@ public class WxLiveBillController extends BaseController { @Log(title = "生活缴费账单", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxLiveBillBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxLiveBillService.queryList(bo); ExcelUtil.exportExcel(list, "生活缴费账单", WxLiveBillVo.class, response); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxPayRecordController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxPayRecordController.java index 2bcdd3b..956d21b 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxPayRecordController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxPayRecordController.java @@ -13,6 +13,7 @@ import com.propertyManagement.common.core.page.TableDataInfo; import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -44,6 +45,9 @@ public class WxPayRecordController extends BaseController { @SaCheckPermission("business:payRecord:list") @GetMapping("/list") public TableDataInfo list(WxPayRecordBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxPayRecordService.queryPageList(bo, pageQuery); } @@ -54,6 +58,9 @@ public class WxPayRecordController extends BaseController { @Log(title = "缴费记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxPayRecordBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxPayRecordService.queryList(bo); ExcelUtil.exportExcel(list, "缴费记录", WxPayRecordVo.class, response); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxProprietorLedgerController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxProprietorLedgerController.java index 4f77621..9d0769c 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxProprietorLedgerController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxProprietorLedgerController.java @@ -15,6 +15,7 @@ import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; import com.propertyManagement.common.excel.ExcelResult; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; @@ -49,6 +50,9 @@ public class WxProprietorLedgerController extends BaseController { @SaCheckPermission("business:proprietorLedger:list") @GetMapping("/list") public TableDataInfo list(WxProprietorLedgerBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxProprietorLedgerService.queryPageList(bo, pageQuery); } @@ -58,6 +62,9 @@ public class WxProprietorLedgerController extends BaseController { @SaCheckPermission("business:proprietorLedger:list") @GetMapping("/listAll") public R> listAll(WxProprietorLedgerBo bo) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return R.ok(iWxProprietorLedgerService.queryList(bo)); } @@ -68,6 +75,9 @@ public class WxProprietorLedgerController extends BaseController { @Log(title = "小区业主台账信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxProprietorLedgerBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxProprietorLedgerService.queryList(bo); ExcelUtil.exportExcel(list, "小区业主台账信息", WxProprietorLedgerVo.class, response); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxRepairsController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxRepairsController.java index b99eef6..44ecd82 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxRepairsController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxRepairsController.java @@ -13,6 +13,7 @@ import com.propertyManagement.common.core.page.TableDataInfo; import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -44,6 +45,9 @@ public class WxRepairsController extends BaseController { @SaCheckPermission("business:repairs:list") @GetMapping("/list") public TableDataInfo list(WxRepairsBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxRepairsService.queryPageList(bo, pageQuery); } @@ -54,6 +58,9 @@ public class WxRepairsController extends BaseController { @Log(title = "报修", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxRepairsBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxRepairsService.queryList(bo); ExcelUtil.exportExcel(list, "报修", WxRepairsVo.class, response); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxRuleController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxRuleController.java index f8eb90c..e4d1476 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxRuleController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxRuleController.java @@ -13,6 +13,7 @@ import com.propertyManagement.common.core.page.TableDataInfo; import com.propertyManagement.common.core.validate.AddGroup; import com.propertyManagement.common.core.validate.EditGroup; import com.propertyManagement.common.enums.BusinessType; +import com.propertyManagement.common.helper.LoginHelper; import com.propertyManagement.common.utils.poi.ExcelUtil; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -44,6 +45,9 @@ public class WxRuleController extends BaseController { @SaCheckPermission("business:rule:list") @GetMapping("/list") public TableDataInfo list(WxRuleBo bo, PageQuery pageQuery) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } return iWxRuleService.queryPageList(bo, pageQuery); } @@ -54,6 +58,9 @@ public class WxRuleController extends BaseController { @Log(title = "规则说明", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WxRuleBo bo, HttpServletResponse response) { + if (!LoginHelper.isAdmin()) { + bo.setCommunityId(LoginHelper.getLoginUser().getCommunityId()); + } List list = iWxRuleService.queryList(bo); ExcelUtil.exportExcel(list, "规则说明", WxRuleVo.class, response); } diff --git a/propertyManagement-common/src/main/java/com/propertyManagement/common/core/domain/entity/SysUser.java b/propertyManagement-common/src/main/java/com/propertyManagement/common/core/domain/entity/SysUser.java index 14fc5a0..95a4b51 100644 --- a/propertyManagement-common/src/main/java/com/propertyManagement/common/core/domain/entity/SysUser.java +++ b/propertyManagement-common/src/main/java/com/propertyManagement/common/core/domain/entity/SysUser.java @@ -41,6 +41,16 @@ public class SysUser extends BaseEntity { */ private Long deptId; + /** + * 小区ID + */ + private Long communityId; + + /** + * 小区名称 + */ + private String communityName; + /** * 用户账号 */ diff --git a/propertyManagement-common/src/main/java/com/propertyManagement/common/core/domain/model/LoginUser.java b/propertyManagement-common/src/main/java/com/propertyManagement/common/core/domain/model/LoginUser.java index 9528f9a..4569baf 100644 --- a/propertyManagement-common/src/main/java/com/propertyManagement/common/core/domain/model/LoginUser.java +++ b/propertyManagement-common/src/main/java/com/propertyManagement/common/core/domain/model/LoginUser.java @@ -30,6 +30,11 @@ public class LoginUser implements Serializable { */ private Long deptId; + /** + * 小区ID + */ + private Long communityId; + /** * 部门名 */ diff --git a/propertyManagement-system/src/main/java/com/propertyManagement/system/service/SysLoginService.java b/propertyManagement-system/src/main/java/com/propertyManagement/system/service/SysLoginService.java index 606c32d..145d0f1 100644 --- a/propertyManagement-system/src/main/java/com/propertyManagement/system/service/SysLoginService.java +++ b/propertyManagement-system/src/main/java/com/propertyManagement/system/service/SysLoginService.java @@ -276,6 +276,7 @@ public class SysLoginService { private LoginUser buildLoginUser(SysUser user) { LoginUser loginUser = new LoginUser(); loginUser.setUserId(user.getUserId()); + loginUser.setCommunityId(user.getCommunityId()); loginUser.setDeptId(user.getDeptId()); loginUser.setUsername(user.getUserName()); loginUser.setUserType(user.getUserType()); diff --git a/propertyManagement-system/src/main/java/com/propertyManagement/system/service/impl/SysUserServiceImpl.java b/propertyManagement-system/src/main/java/com/propertyManagement/system/service/impl/SysUserServiceImpl.java index 645508a..fa37130 100644 --- a/propertyManagement-system/src/main/java/com/propertyManagement/system/service/impl/SysUserServiceImpl.java +++ b/propertyManagement-system/src/main/java/com/propertyManagement/system/service/impl/SysUserServiceImpl.java @@ -75,6 +75,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { Map params = user.getParams(); QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) + .eq(ObjectUtil.isNotNull(user.getCommunityId()), "u.community_id", user.getCommunityId()) .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId()) .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus()) diff --git a/propertyManagement-system/src/main/resources/mapper/system/SysUserMapper.xml b/propertyManagement-system/src/main/resources/mapper/system/SysUserMapper.xml index 20af363..c780a50 100644 --- a/propertyManagement-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/propertyManagement-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -7,6 +7,8 @@ + + @@ -50,6 +52,7 @@ select u.user_id, u.dept_id, + u.community_id, u.user_name, u.nick_name, u.user_type, @@ -86,9 +89,10 @@ diff --git a/propertyManagement-ui/src/views/business/account/index.vue b/propertyManagement-ui/src/views/business/account/index.vue index 3d4a0c5..16be4a7 100644 --- a/propertyManagement-ui/src/views/business/account/index.vue +++ b/propertyManagement-ui/src/views/business/account/index.vue @@ -1,7 +1,7 @@