1.增加小区限制，非超管仅限查看所在小区数据

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);
     }

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);
     }

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);
     }

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);
     }

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);
     }

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);
     }
 

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));
     }
 

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);
     }

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);
     }

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);
     }

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);
     }

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);
     }

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);
     }

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;
+
     /**
      * 用户账号
      */

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;
+
     /**
      * 部门名
      */

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());

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())

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>
 

propertyManagement-ui/src/views/business/account/index.vue

 <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();
   },

propertyManagement-ui/src/views/business/clock/index.vue

 <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();
   },

propertyManagement-ui/src/views/business/comment/index.vue

 <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();
   },

propertyManagement-ui/src/views/business/commonPhone/index.vue

 <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();
   },

propertyManagement-ui/src/views/business/community/index.vue

 <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

propertyManagement-ui/src/views/business/familyMember/index.vue

 <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();
   },

propertyManagement-ui/src/views/business/guest/index.vue

 <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();
   },

propertyManagement-ui/src/views/business/liveBill/index.vue

 <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();
   },

propertyManagement-ui/src/views/business/payRecord/index.vue

 <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();
   },

propertyManagement-ui/src/views/business/proprietorLedger/index.vue

 <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();
   },

propertyManagement-ui/src/views/business/repairs/index.vue

 <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();
   },

propertyManagement-ui/src/views/business/rule/index.vue

 <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();
   },

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 => {