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 6e3342fbeef199c17e4678363b4db1ebef6ad901..c33a53fbb7fe0b0516b9ea611a9cd6faf9448942 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<WxAccountVo> 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<WxAccountVo> 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 696f2fec047ed41f6abefc981260198b0cf60487..53917a4e19d3cb213342fc6b15972899607dd00e 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<WxCarportVo> 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<WxCarportVo> 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 856e61d2e0a6db6202552688cb8e62375faa68ee..e3a0806cf05f4675d51011cded229b3c8368750f 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<WxClockVo> 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<WxClockVo> 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 6720ca2fc351a89fd7e3225cd4c23f4230ebb119..b9ee7e8f7772d1ccb9d5ede35227cd91e94df430 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<WxCommentVo> 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<WxCommentVo> 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 d732ed58964231fe6c57ffbd4f263fc34f2d090b..3dd5a439fb99af22ff11ac69996a3fe2ab488381 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<WxCommonPhoneVo> 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<WxCommonPhoneVo> 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 ca0d2066b360ba50aa958ae6a8ff832581728960..019e41f089ac3559a5a9c540a48ad3bbeb1bea28 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<WxCommunityVo> 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 530994373c9723c7bf11108dd88646fb89e27a54..db846de544c526d28ae16c12d20a10070ac58c40 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<WxFamilyMemberVo> 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<List<WxFamilyMemberVo>> 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 2b493b87258951e96156381c7956edede7ade856..1ea34b2ea99d92ada8204f2a345082b737386476 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<WxGuestVo> 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<WxGuestVo> 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 75234c763ade637de151df2e7c153c74fdf6059a..3ee540cadee5b4c73ce79bf0516c2012de899777 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<WxLiveBillVo> 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<WxLiveBillVo> 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 2bcdd3b110d45bee0e19343ee795b5e04b0036ac..956d21bd66ade6fddef98d7df15ef6783736d3cd 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<WxPayRecordVo> 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<WxPayRecordVo> 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 4f776218c9e66f4c9957598d17ddcd180dfb3c9f..9d0769cb063ac611f6c32e7067801d664cbd4f06 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<WxProprietorLedgerVo> 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<List<WxProprietorLedgerVo>> 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<WxProprietorLedgerVo> 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 b99eef67ab33f081c88896f1c74a9f107e39d8ba..44ecd82356abf97264de4ca8a567f2aa318b4dcf 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<WxRepairsVo> 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<WxRepairsVo> 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 f8eb90c17a28ab264f57d49eb63bf4a0c555a535..e4d1476a7aadda51439f5b72b4d610ceb8edb899 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<WxRuleVo> 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<WxRuleVo> 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 14fc5a03e737b26115bcb1d0a6fd31a740cd4895..95a4b51a1ec01c87542465cc43268ee2dd09dff7 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 9528f9af001696d026a35cdba05035b9d3d1a0b4..4569baf18629b65706efc7dc2daecad7f3f629a1 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 606c32d060a8793c6f039f31daabc467e55bd83f..145d0f17c49903f3f33c4e4495789d57c92eb301 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 645508ad1408ca5fa3af34dbcd696b84ca2fbac7..fa3713034d5d22e5fb3203f3eca37b0088493bb3 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<String, Object> params = user.getParams();
         QueryWrapper<SysUser> 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 20af363b35ab3c9f853b965ec3df457267bebde3..c780a505884e09d436211fac8c076b9c4ef9cb92 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 @@
     <resultMap type="SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
+        <result property="communityId" column="community_id"/>
+        <result property="communityName" column="community_name"/>
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="userType" column="user_type"/>
@@ -50,6 +52,7 @@
     <sql id="selectUserVo">
         select u.user_id,
                u.dept_id,
+               u.community_id,
                u.user_name,
                u.nick_name,
                u.user_type,
@@ -86,9 +89,10 @@
 
     <select id="selectPageUserList" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader, w.community_id, w.community_name
         from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
+            left join wx_community w on u.community_id = w.community_id
         ${ew.getCustomSqlSegment}
     </select>
 
diff --git a/propertyManagement-ui/src/views/business/account/index.vue b/propertyManagement-ui/src/views/business/account/index.vue
index 3d4a0c57fa7199135d36646c70889a436acac082..16be4a710d3de3d9220f02d52d2d8f7c3a659822 100644
--- a/propertyManagement-ui/src/views/business/account/index.vue
+++ b/propertyManagement-ui/src/views/business/account/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区" prop="communityId">
+      <el-form-item label="小区" prop="communityId" v-if="username === 'admin'">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" filterable clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -237,6 +237,7 @@ export default {
   dicts: ['account_type', 'sys_user_sex'],
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -300,6 +301,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/business/clock/index.vue b/propertyManagement-ui/src/views/business/clock/index.vue
index 46a1249c90ce756213eec2b3518a3bc9ba3c705d..738d43a18bc1f2210240bbea68dde3fa4ddf9ea3 100644
--- a/propertyManagement-ui/src/views/business/clock/index.vue
+++ b/propertyManagement-ui/src/views/business/clock/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区" prop="communityId">
+      <el-form-item label="小区" prop="communityId" v-if="username === 'admin'">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -211,6 +211,7 @@ export default {
   components: {Info},
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -278,6 +279,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/business/comment/index.vue b/propertyManagement-ui/src/views/business/comment/index.vue
index f38291125eecb111d33a29835697a357ee7ba862..6728bb1b88d0834d5c8f1c074cd777c9d8fdd21c 100644
--- a/propertyManagement-ui/src/views/business/comment/index.vue
+++ b/propertyManagement-ui/src/views/business/comment/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区" prop="communityId">
+      <el-form-item label="小区" prop="communityId" v-if="username === 'admin'">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -227,6 +227,7 @@ export default {
   dicts: ['wx_comment_state', 'wx_comment_type'],
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -301,6 +302,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/business/commonPhone/index.vue b/propertyManagement-ui/src/views/business/commonPhone/index.vue
index 95c8c55bda330cee38608c3e9f7721d36eadb630..e80f794453dce900f28c8855d038033d73ce2458 100644
--- a/propertyManagement-ui/src/views/business/commonPhone/index.vue
+++ b/propertyManagement-ui/src/views/business/commonPhone/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区" prop="communityId">
+      <el-form-item label="小区" prop="communityId" v-if="username === 'admin' ">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -169,6 +169,7 @@ export default {
   dicts: ['sys_is_enable'],
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -229,6 +230,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/business/community/index.vue b/propertyManagement-ui/src/views/business/community/index.vue
index 98e26ecb84420332d2aef0e89d58c08e810298bb..e4746729e8282f9b6c2fc451a5e0f91ec2925611 100644
--- a/propertyManagement-ui/src/views/business/community/index.vue
+++ b/propertyManagement-ui/src/views/business/community/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区名称" prop="communityName">
-        <el-input
-          v-model="queryParams.communityName"
-          placeholder="请输入小区名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="小区名称" prop="communityName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.communityName"-->
+<!--          placeholder="请输入小区名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="是否启用" prop="isEnable">
         <el-select v-model="queryParams.isEnable" placeholder="请选择是否启用" clearable>
           <el-option
diff --git a/propertyManagement-ui/src/views/business/familyMember/index.vue b/propertyManagement-ui/src/views/business/familyMember/index.vue
index 8c5b8daf7df7a8bd26760500a522387a433bad51..6627e03d33f2b5f72d57233dad1ca6f0776d667e 100644
--- a/propertyManagement-ui/src/views/business/familyMember/index.vue
+++ b/propertyManagement-ui/src/views/business/familyMember/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区" prop="communityId">
+      <el-form-item label="小区" prop="communityId" v-if="username === 'admin'">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -199,6 +199,7 @@ export default {
   dicts: ['wx_family_member_state', 'wx_family_member_relation'],
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -253,6 +254,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/business/guest/index.vue b/propertyManagement-ui/src/views/business/guest/index.vue
index 7279fd94f8a6ac9e8aa0025d555c5b9238b861ba..0a76e0288d63e2af0064ee3067ae7b70d4d0b213 100644
--- a/propertyManagement-ui/src/views/business/guest/index.vue
+++ b/propertyManagement-ui/src/views/business/guest/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区" prop="communityId">
+      <el-form-item label="小区" prop="communityId" v-if="username === 'admin'">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" filterable clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -194,6 +194,7 @@ export default {
   name: "Guest",
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -255,6 +256,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/business/liveBill/index.vue b/propertyManagement-ui/src/views/business/liveBill/index.vue
index c4a7251d77f9b3c687b65cfad67a5daf15a54fce..1ac8e2b6a908b171eb48ed06dc51f9f44b59e65b 100644
--- a/propertyManagement-ui/src/views/business/liveBill/index.vue
+++ b/propertyManagement-ui/src/views/business/liveBill/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区" prop="communityId">
+      <el-form-item label="小区" prop="communityId" v-if="username === 'admin'">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -296,6 +296,7 @@ export default {
   dicts: ['wx_live_bill_type', 'wx_live_bill_state'],
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -362,6 +363,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/business/payRecord/index.vue b/propertyManagement-ui/src/views/business/payRecord/index.vue
index 6dfcd0090e160cf1d402262227bf232bea77d330..a050d71d3f8d398938bca74a418fcb9293eacf28 100644
--- a/propertyManagement-ui/src/views/business/payRecord/index.vue
+++ b/propertyManagement-ui/src/views/business/payRecord/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区名称" prop="communityId">
+      <el-form-item label="小区名称" prop="communityId" v-if="username === 'admin'">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -263,6 +263,7 @@ export default {
   dicts: ['wx_pay_record_state', 'wx_pay_record_type'],
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -369,6 +370,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/business/proprietorLedger/index.vue b/propertyManagement-ui/src/views/business/proprietorLedger/index.vue
index 9d433a8e9b0a4c36bb8df840ba2d267ae451b711..45283b20084a61e897435908a1f19154bf18d392 100644
--- a/propertyManagement-ui/src/views/business/proprietorLedger/index.vue
+++ b/propertyManagement-ui/src/views/business/proprietorLedger/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区名称" prop="communityId">
+      <el-form-item label="小区名称" prop="communityId" v-if="username === 'admin'">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -362,6 +362,7 @@ export default {
   name: "ProprietorLedger",
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -461,6 +462,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/business/repairs/index.vue b/propertyManagement-ui/src/views/business/repairs/index.vue
index 726480337a24930feb86b3dccf7a7fbb9d9d60aa..471dd138a80b89473a11ff34ed96395a6a34c8d0 100644
--- a/propertyManagement-ui/src/views/business/repairs/index.vue
+++ b/propertyManagement-ui/src/views/business/repairs/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区" prop="communityId">
+      <el-form-item label="小区" prop="communityId" v-if="username === 'admin'">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -277,6 +277,7 @@ export default {
   dicts: ['wx_repairs_state', 'wx_repairs_type'],
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -378,6 +379,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/business/rule/index.vue b/propertyManagement-ui/src/views/business/rule/index.vue
index 386d82634f4daa31bbc24c960cd8c38197209e21..793206e30cd40fdf629ddc4e05f6d862952754c8 100644
--- a/propertyManagement-ui/src/views/business/rule/index.vue
+++ b/propertyManagement-ui/src/views/business/rule/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区" prop="communityId">
+      <el-form-item label="小区" prop="communityId" v-if="username === 'admin'">
         <el-select v-model="queryParams.communityId" placeholder="请选择小区" filterable clearable>
           <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
         </el-select>
@@ -182,6 +182,7 @@ export default {
   dicts: ['sys_is_enable', 'wx_rule_type'],
   data() {
     return {
+      username: undefined,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -233,6 +234,13 @@ export default {
     };
   },
   created() {
+    let sessionObj = JSON.parse(sessionStorage.getItem('sessionObj'));
+    if (sessionObj) {
+      let loginUser = JSON.parse(sessionObj.data);
+      if (loginUser) {
+        this.username = loginUser.username
+      }
+    }
     this.getList();
     this.getCommunityListAll();
   },
diff --git a/propertyManagement-ui/src/views/system/user/index.vue b/propertyManagement-ui/src/views/system/user/index.vue
index 5616c74175332908854e55b885b59c8c8cf88a9f..00035140c76b41d067fd71a8d5f5bc39a26e7ee1 100644
--- a/propertyManagement-ui/src/views/system/user/index.vue
+++ b/propertyManagement-ui/src/views/system/user/index.vue
@@ -63,6 +63,11 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="小区" prop="communityId">
+            <el-select v-model="queryParams.communityId" placeholder="请选择小区" filterable clearable>
+              <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
+            </el-select>
+          </el-form-item>
           <el-form-item label="创建时间">
             <el-date-picker
               v-model="dateRange"
@@ -144,6 +149,7 @@
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="所属小区" align="center" key="communityName" prop="communityName" width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
@@ -225,8 +231,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            <el-form-item label="所属小区" prop="communityId">
+<!--              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />-->
+              <el-select v-model="form.communityId" filterable style="width: 100%" placeholder="请选择所属小区">
+                <el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName"/>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -348,6 +357,7 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {listCommunityAll} from "@/api/business/community";
 
 export default {
   name: "User",
@@ -385,6 +395,7 @@ export default {
       postOptions: [],
       // 角色选项
       roleOptions: [],
+      communityList: [],
       // 表单参数
       form: {},
       defaultProps: {
@@ -410,6 +421,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        communityId: undefined,
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
@@ -438,6 +450,9 @@ export default {
           { required: true, message: "用户密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ],
+        communityId: [
+          { required: true, message: "所属小区不能为空", trigger: "blur" }
+        ],
         email: [
           {
             type: "email",
@@ -467,6 +482,7 @@ export default {
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
+    this.getCommunityListAll()
   },
   methods: {
     /** 查询用户列表 */
@@ -479,6 +495,12 @@ export default {
         }
       );
     },
+    /** 查询全部小区列表 */
+    getCommunityListAll() {
+      listCommunityAll().then(response => {
+        this.communityList = response.data;
+      });
+    },
     /** 查询部门下拉树结构 */
     getDeptTree() {
       deptTreeSelect().then(response => {