feats

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,114 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL =
-            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: : " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

.mvn/wrapper/maven-wrapper.properties

@@ -1 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.58</version>
+	<version>1.0.59</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -14,6 +14,9 @@ import com.huiju.estateagents.center.taUser.service.*;
 import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaRoleMapper;
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.huiju.estateagents.property.service.ITaUserCommunityService;
+import com.huiju.estateagents.property.service.ITpCommunityService;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -84,6 +87,12 @@ public class TaUserController extends BaseController {
     @Autowired
     public ITpLifeConsultantEvaluateService iTpLifeConsultantEvaluateService;
 
+    @Autowired
+    public ITpCommunityService iTpCommunityService;
+
+    @Autowired
+    public ITaUserCommunityService iTaUserCommunityService;
+
     @Autowired
     public CaptchaUtils captchaUtils;
 
@@ -312,15 +321,20 @@ public class TaUserController extends BaseController {
             taUser.setOrgLogo(taOrg.getLogo());
             taUser.setOrgDesc(taOrg.getOrgDesc());
             taUser.setBossDisplay(taOrg.getBossDisplay());
+            //
+            taUser.setCommunityList(iTaUserCommunityService.getListBy(taUser.getOrgId(), taUser.getUserId()));
 
             //获取所有菜单
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
 
+            // 获取所有社区
+            List<TpCommunity> communityList = iTpCommunityService.getAllByOrg(taUser.getOrgId());
 
             userMap.put("taUser", taUser);
             userMap.put("menuList", allMenus);
             userMap.put("buttonList", allButtons);
+            userMap.put("communityList", communityList);
             responseBean.addSuccess(userMap);
         }catch (Exception e){
             e.printStackTrace();
@@ -524,6 +538,9 @@ public class TaUserController extends BaseController {
                     taUser.setBuildingIds(buildings);
                 }
             }
+
+            taUser.setCommunityList(iTaUserCommunityService.getListBy(taUser.getOrgId(), taUser.getUserId()));
+
             responseBean.addSuccess(taUser);
         }catch (Exception e){
             e.printStackTrace();
@@ -610,34 +627,17 @@ public class TaUserController extends BaseController {
     public ResponseBean lifeConsultantList(@PathVariable String client,
                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           @RequestParam(value ="communityId") Integer communityId,
                                            @RequestParam(value ="userName", required = false) String userName,
                                            @RequestParam(value ="phone", required = false) String phone,
                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String month = new SimpleDateFormat("yyyyMM").format(new Date());
         try {
             //使用分页插件
             IPage<TaUser> pg = new Page<TaUser>(pageNum, pageSize);
-            LambdaQueryWrapper<TaUser> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(TaUser::getOrgId,getOrgId(request));
-            queryWrapper.eq(TaUser::getType,"life-consultant");
-            queryWrapper.like(!StringUtils.isEmpty(userName), TaUser::getUserName,"%"+ userName + "%");
-            queryWrapper.like(!StringUtils.isEmpty(phone), TaUser::getPhone,"%"+ phone + "%");
-            queryWrapper.orderByDesc(TaUser::getCreateDate);
-            IPage<TaUser> result = iTaUserService.page(pg,queryWrapper);
-            List<TaUser> records = result.getRecords();
-            records.forEach(e -> {
-                LambdaQueryWrapper<TpLifeConsultantEvaluate> evaluateQueryWrapper = new LambdaQueryWrapper<>();
-                evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getOrgId,getOrgId(request));
-                evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getUserId,e.getUserId());
-                evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getEvaluateTime,new SimpleDateFormat("yyyyMM").format(new Date()));
-                List<TpLifeConsultantEvaluate> list = iTpLifeConsultantEvaluateService.list(evaluateQueryWrapper);
-                if (list.size() > 0){
-                    double asDouble = list.stream().mapToInt(TpLifeConsultantEvaluate::getScore).average().getAsDouble();
-                    // 平均分
-                    e.setAverageScore(asDouble);
+            IPage<TaUser> result = iTaUserService.getLifeConsultants(pg, getOrgId(request), communityId, month, userName, phone);
 
-                }
-            });
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.property.entity.TpCommunity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -289,4 +290,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private Double averageScore;
+
+    /**
+     * 授权的社区
+     */
+    @TableField(exist = false)
+    private List<TpCommunity> communityList;
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -38,4 +38,11 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
     List<String> getBuildingIdsOf(@Param("userId") Integer userId,@Param("buildingId") String buildingId);
 
     TaUser getUserByPerson(@Param("orgId") Integer orgId, @Param("personId") String personId);
+
+    IPage<TaUser> getLifeConsultants(IPage<TaUser> pg,
+                                     @Param("orgId")  Integer orgId,
+                                     @Param("communityId")  Integer communityId,
+                                     @Param("month")  String month,
+                                     @Param("userName")  String userName,
+                                     @Param("phone") String phone);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -75,4 +75,6 @@ public interface ITaUserService extends IService<TaUser> {
      * @return
      */
     TaUser getUserInfoById(Integer userId, Integer orgId);
+
+    IPage<TaUser> getLifeConsultants(IPage<TaUser> pg, Integer orgId, Integer communityId, String month, String userName, String phone);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -22,6 +22,9 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.property.entity.TaUserCommunity;
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.huiju.estateagents.property.service.ITaUserCommunityService;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,6 +101,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
     @Autowired
     private TaChannelProxyMapper taChannelProxyMapper;
 
+    @Autowired
+    private ITaUserCommunityService iTaUserCommunityService;
+
     @Autowired
     private WxUtils wxUtils;
 
@@ -495,6 +501,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             });
         }
 
+        // 保存授权小区
+        if (null == taUser.getCommunityList() || taUser.getCommunityList().size() < 1) {
+            throw new Exception("未授权小区");
+        }
+
+        iTaUserCommunityService.addUserCommunity(taUser.getOrgId(), taUser.getUserId(), taUser.getCommunityList());
+
         return taUser;
     }
 
@@ -588,6 +601,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             });
         }
 
+        // 保存授权小区
+        if (null == taUser.getCommunityList() || taUser.getCommunityList().size() < 1) {
+            throw new Exception("未授权小区");
+        }
+
+        iTaUserCommunityService.addUserCommunity(taUser.getOrgId(), taUser.getUserId(), taUser.getCommunityList());
+
         //更新person
         TaPerson taPerson = new TaPerson();
         taPerson.setAvatarurl(taUser.getAvatar());
@@ -697,6 +717,11 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         return getOne(userQueryWrapper);
     }
 
+    @Override
+    public IPage<TaUser> getLifeConsultants(IPage<TaUser> pg, Integer orgId, Integer communityId, String month, String userName, String phone) {
+        return taUserMapper.getLifeConsultants(pg, orgId, communityId, month, userName, phone);
+    }
+
     private boolean updateUserStatus(TaUser user) {
         UpdateWrapper<TaUser> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("user_id", user.getUserId());

src/main/java/com/huiju/estateagents/property/controller/AnnouncementTelController.java

@@ -48,7 +48,9 @@ public class AnnouncementTelController extends BaseController {
 
 	})
 	@RequestMapping(value = "/admin/announcement-tels",method = RequestMethod.GET)
-	public ResponseBean getList(@RequestParam(value = "name", required = false) String name,
+	public ResponseBean getList(@RequestParam(value = "type") String type,
+								@RequestParam(value = "communityId", required = false) Integer communityId,
+								@RequestParam(value = "name", required = false) String name,
                                 @RequestParam(value = "tel", required = false) String tel,
                                 @RequestParam(value = "remark", required = false) String remark,
                                 @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
@@ -59,7 +61,9 @@ public class AnnouncementTelController extends BaseController {
 		announcementTel.setOrgId(userElement.getOrgId());
 		announcementTel.setName(name);
 		announcementTel.setTel(tel);
+		announcementTel.setType(type);
 		announcementTel.setRemark(remark);
+		announcementTel.setCommunityId(communityId);
 		responseBean = announcementTelService.getTelList(announcementTel,pageNum,pageSize);
 		return responseBean;
 	}

src/main/java/com/huiju/estateagents/property/controller/BillController.java

@@ -149,11 +149,12 @@ public class BillController extends BaseController {
 
     })
     @RequestMapping(value = "/admin/bill/downloadExcel", method = RequestMethod.GET)
-    public void exportExcel(@RequestParam(value = "phaseId",required = false) String phaseId,
+    public void exportExcel(@RequestParam(value = "phaseId") Integer communityId,
+                            @RequestParam(value = "phaseId",required = false) String phaseId,
                             @RequestParam(value = "buildingId",required = false) String buildingId,
-            HttpServletResponse response, HttpServletRequest request) {
+                            HttpServletResponse response, HttpServletRequest request) {
         TaUser userElement = getTaUser(request);
-        HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement,phaseId,buildingId).getData();
+        HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement,communityId, phaseId,buildingId).getData();
 //        this.setResponseHeader(response, "缴费单模板.xls");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");

src/main/java/com/huiju/estateagents/property/controller/BuildingOwnerInfoController.java

@@ -220,14 +220,25 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
 
+    private List<Integer> getCommunityIdsBy(String communityIds) {
+        List<Integer> communityIdList = new ArrayList<>();
+        String[] parts = communityIds.split(",");
+        for (String id : parts) {
+            communityIdList.add(Integer.parseInt(id));
+        }
+        return communityIdList;
+    }
+
     // @ApiOperation(value = "查询 期区", notes = "查询 期区")
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/admin/buildingInfo/phase",method = RequestMethod.GET)
-    public ResponseBean getPhaseList(HttpServletRequest request){
+    public ResponseBean getPhaseList(@RequestParam Integer communityId,
+                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+
         TaUser userElement = getTaUser(request);
-        responseBean = iBuildingOwnerInfoService.getPhaseList(userElement.getOrgId());
+        responseBean = iBuildingOwnerInfoService.getPhaseList(userElement.getOrgId(), communityId);
         return responseBean;
     }
     
@@ -289,11 +300,13 @@ public class BuildingOwnerInfoController extends BaseController {
  
     // @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
     @PostMapping(value = "/admin/buildingInfo/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
+    public ResponseBean submitExcel(@RequestParam("file") MultipartFile file,
+                                    @RequestParam("communityId") Integer communityId,
+                                    HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         try {
-            responseBean = iBuildingOwnerInfoService.submitExcelData(file,userElement);
+            responseBean = iBuildingOwnerInfoService.submitExcelData(file, communityId, userElement);
         }catch (Exception e){
             responseBean.addError("导入数据失败" + e.getMessage());
             e.printStackTrace();
@@ -364,9 +377,11 @@ public class BuildingOwnerInfoController extends BaseController {
 
     })
     @RequestMapping(value = "/admin/buildingInfo/downloadExcel", method = RequestMethod.GET)
-    public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
+    public void exportExcel(@RequestParam Integer communityId,
+                            HttpServletResponse response,
+                            HttpServletRequest request) {
         TaUser userElement = getTaUser(request);
-        XSSFWorkbook workbook = (XSSFWorkbook) iBuildingOwnerInfoService.downloadExcel(userElement).getData();
+        XSSFWorkbook workbook = (XSSFWorkbook) iBuildingOwnerInfoService.downloadExcel(communityId, userElement).getData();
 //        this.setResponseHeader(response, "业主资料库.xlsx");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");

src/main/java/com/huiju/estateagents/property/controller/BuildingTreeController.java

@@ -40,10 +40,16 @@ public class BuildingTreeController extends BaseController {
 	
 	// @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
 	@PostMapping(value = "/admin/buildingInfo/tree/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-	public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
+	public ResponseBean submitExcel(@RequestParam("file") MultipartFile file,
+									@RequestParam("communityId") Integer communityId,
+									HttpServletRequest request) {
+		if (null == communityId || communityId < 1) {
+			return ResponseBean.error("请设置上传小区", ResponseBean.ERROR_MISSING_PARAMS);
+		}
+
 		ResponseBean responseBean = new ResponseBean();
 		TaUser userElement = getTaUser(request);
-		responseBean = buildingTreeService.submitExcelData(file,userElement);
+		responseBean = buildingTreeService.submitExcelData(file, communityId, userElement);
 		return responseBean;
 	}
 	

src/main/java/com/huiju/estateagents/property/controller/TpCommunityController.java

@@ -0,0 +1,160 @@
+package com.huiju.estateagents.property.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.huiju.estateagents.property.service.ITpCommunityService;
+import com.huiju.estateagents.property.entity.TpCommunity;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+
+@Api(tags = "")
+@RestController
+@RequestMapping("/api")
+public class TpCommunityController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TpCommunityController.class);
+
+    @Autowired
+    public ITpCommunityService iTpCommunityService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/tpCommunity",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tpCommunityList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable("client") String client,
+                                        @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        HttpServletRequest request) throws Exception{
+
+		    IPage<TpCommunity> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TpCommunity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("wx".equals(client), "status", CommConstant.STATUS_NORMAL);
+            queryWrapper.gt("admin".equals(client), "status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TpCommunity> result = iTpCommunityService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param tpCommunity 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/tpCommunity",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean tpCommunityAdd(@ApiParam("保存内容") @RequestBody TpCommunity tpCommunity,
+                                       HttpServletRequest request) throws Exception{
+
+        tpCommunity.setOrgId(getOrgId(request));
+
+        if (iTpCommunityService.save(tpCommunity)){
+            return ResponseBean.success(tpCommunity);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/tpCommunity/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean tpCommunityDelete(@ApiParam("对象ID") @PathVariable Integer id,
+                                          HttpServletRequest request) throws Exception{
+
+        TpCommunity tpCommunity = iTpCommunityService.getById(id);
+        if (null == tpCommunity || CommConstant.STATUS_DELETE.equals(tpCommunity.getStatus())) {
+            return ResponseBean.error("没有找到对应的社区信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        if (!orgId.equals(tpCommunity.getOrgId())) {
+            return ResponseBean.error("暂无操作权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        tpCommunity.setStatus(CommConstant.STATUS_DELETE);
+
+        return tpCommunityUpdate(id, tpCommunity, request);
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tpCommunity 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/tpCommunity/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean tpCommunityUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                          @ApiParam("更新内容") @RequestBody TpCommunity tpCommunity,
+                                          HttpServletRequest request) throws Exception{
+        tpCommunity.setId(id);
+
+        Integer orgId = getOrgId(request);
+        if (!orgId.equals(tpCommunity.getOrgId())) {
+            return ResponseBean.error("暂无操作权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (iTpCommunityService.updateById(tpCommunity)){
+            return ResponseBean.success(iTpCommunityService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/tpCommunity/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tpCommunityGet(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable("client") String client,
+                                       @ApiParam("对象ID") @PathVariable Integer id,
+                                       HttpServletRequest request) throws Exception{
+
+        TpCommunity tpCommunity = iTpCommunityService.getById(id);
+        if (null == tpCommunity || CommConstant.STATUS_DELETE.equals(tpCommunity.getStatus())) {
+            return ResponseBean.error("没有找到对应的社区信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        if (!orgId.equals(tpCommunity.getOrgId())) {
+            return ResponseBean.error("暂无操作权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success(tpCommunity);
+    }
+}

src/main/java/com/huiju/estateagents/property/controller/UserVerifyController.java

@@ -34,13 +34,15 @@ public class UserVerifyController extends BaseController {
     @RequestMapping(value = "/admin/prop-user/verify/all", method = RequestMethod.GET)
     // @ApiOperation(value = "获取待审核的用户列表", notes = "获取待审核的用户列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "communityId", value = "小区ID"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "phone", value = "手机号"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "userName", value = "用户名"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "idCard", value = "身份证"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageNum", value = "第几页"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageSize", value = "一页多少行"),
     })
-    public ResponseBean getAll(@RequestParam(value = "phone", required = false) String phone,
+    public ResponseBean getAll(@RequestParam(value = "communityId") Integer communityId,
+                               @RequestParam(value = "phone", required = false) String phone,
                                @RequestParam(value = "userName", required = false) String userName,
                                @RequestParam(value = "idCard", required = false) String idCard,
                                @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@@ -49,7 +51,7 @@ public class UserVerifyController extends BaseController {
 
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
-        responseBean = iTaUserVerifyService.selectAll(phone, userName, idCard, pageNum, pageSize, userElement);
+        responseBean = iTaUserVerifyService.selectAll(communityId, phone, userName, idCard, pageNum, pageSize, userElement);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/property/dao/TaUserVerifyMapper.java

@@ -23,12 +23,13 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
     /**
      * 根据 手机号 、用户名、身份证
      * @param page
+     * @param communityId
      * @param phone
      * @param userName
      * @param idCard
      * @return
      */
-    IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard, @Param("orgId") Integer orgId);
+    IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, Integer communityId, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard, @Param("orgId") Integer orgId);
 
     /**
      * 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主

src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java

@@ -47,7 +47,7 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      */
     @ResultType(TpRoomNo.class)
 //    @Select("select * from tp_room_no where org_id = #{orgId} limit #{pageNum},#{pageSize}")
-    List<TpRoomNo> selectCommunityIdList(@Param("orgId") Integer orgId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+    List<TpRoomNo> selectCommunityIdList(@Param("orgId") Integer orgId, @Param("communityId") Integer communityId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     /**
      * 查询数据，分页
@@ -56,7 +56,7 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      */
     @ResultType(Long.class)
 //    @Select("select count(1) from tp_room_no where org_id = #{orgId}")
-    Long selectCommunityIdCount(@Param("orgId") Integer orgId);
+    Long selectCommunityIdCount(@Param("orgId") Integer orgId, @Param("communityId") Integer communityId);
 
     @ResultType(TpRoomNo.class)
 //    @Select("select * from tp_room_no where org_id=#{orgId} " +
@@ -66,7 +66,7 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
 //            "and level_id=#{levelId}")
     List<TpRoomNo> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
 
-    List<TpRoomNo> selectComunityList(@Param("orgId") Integer orgId, @Param("phaseId") String phaseId, @Param("buildingId") String buildingId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+    List<TpRoomNo> selectComunityList(@Param("orgId") Integer orgId, @Param("communityId") Integer communityId, @Param("phaseId") String phaseId, @Param("buildingId") String buildingId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     IPage<TpRoomNo> getRoomList(IPage<TpRoomNo> page, @Param("orgId") Integer orgId,@Param("phaseId") Integer phaseId,@Param("buildingId") Integer buildingId,@Param("unitId") Integer unitId,@Param("levelId") Integer levelId,@Param("roomNoId") Integer roomNoId);
 

src/main/java/com/huiju/estateagents/property/entity/TaUserCommunity.java

@@ -0,0 +1,44 @@
+package com.huiju.estateagents.property.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaUserCommunity对象", description="")
+public class TaUserCommunity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "小区ID")
+    private Integer communityId;
+
+    @ApiModelProperty(value = "所属机构")
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/property/entity/TpCommunity.java

@@ -0,0 +1,46 @@
+package com.huiju.estateagents.property.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TpCommunity对象", description="")
+public class TpCommunity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "小区ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "小区名称")
+    private String name;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "所属机构")
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/property/mapper/TaUserCommunityMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.entity.TaUserCommunity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Mapper
+public interface TaUserCommunityMapper extends BaseMapper<TaUserCommunity> {
+
+}

src/main/java/com/huiju/estateagents/property/mapper/TpCommunityMapper.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.property.mapper;
+
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Mapper
+public interface TpCommunityMapper extends BaseMapper<TpCommunity> {
+
+    List<TpCommunity> getListOfUser(Integer orgId, Integer userId);
+}

src/main/java/com/huiju/estateagents/property/model/AnnouncementTel.java

@@ -31,10 +31,12 @@ public class AnnouncementTel implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    private Integer orgId;
+
     /**
      * 小区id
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 电话名称

src/main/java/com/huiju/estateagents/property/model/TaUserVerify.java

@@ -33,10 +33,12 @@ public class TaUserVerify implements Serializable {
      */
     private String personId;
 
+    private Integer orgId;
+
     /**
      * 小区id
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 角色ID

src/main/java/com/huiju/estateagents/property/model/TpAnnouncement.java

@@ -22,9 +22,11 @@ public class TpAnnouncement implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    /** 小区id**/
     private Integer orgId;
 
+    /** 小区id**/
+    private Integer communityId;
+
     /**公告标题**/
     private String announcementTitle;
 

src/main/java/com/huiju/estateagents/property/model/TpBuilding.java

@@ -16,10 +16,13 @@ public class TpBuilding implements Serializable {
 	
 	@TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+
+    private Integer orgId;
+
     /**
      * 小区ID
      */
-    private Integer orgId;
+    private Integer communityId;
     
     /**
      * 期区id

src/main/java/com/huiju/estateagents/property/model/TpBuildingOwnerInfo.java

@@ -32,11 +32,13 @@ public class TpBuildingOwnerInfo implements Serializable {
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-    
+
+    private Integer orgId;
+
     /**
      * 小区id
      */
-    private Integer orgId;
+    private Integer communityId;
     
     /**
      * 身份证号码

src/main/java/com/huiju/estateagents/property/model/TpLevel.java

@@ -28,11 +28,13 @@ public class TpLevel implements Serializable {
     
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-    
+
+    private Integer orgId;
+
     /**
      * 小区ID
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 期区ID

src/main/java/com/huiju/estateagents/property/model/TpPhase.java

@@ -28,10 +28,7 @@ public class TpPhase implements Serializable {
     
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-    
-    /**
-     * 小区ID
-     */
+
     private Integer orgId;
 
     /**
@@ -43,4 +40,9 @@ public class TpPhase implements Serializable {
      * 创建时间
      */
     private LocalDateTime createDate;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
 }

src/main/java/com/huiju/estateagents/property/model/TpRoomNo.java

@@ -28,11 +28,13 @@ public class TpRoomNo implements Serializable {
     
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-    
+
+    private Integer orgId;
+
     /**
-     * 小区id
+     * 小区ID
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 期区ID

src/main/java/com/huiju/estateagents/property/model/TpTicket.java

@@ -33,10 +33,13 @@ public class TpTicket implements Serializable {
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+
+    private Integer orgId;
+
     /**
      * 小区id
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 住户app的id

src/main/java/com/huiju/estateagents/property/model/TpUnit.java

@@ -28,11 +28,13 @@ public class TpUnit implements Serializable {
     
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-    
+
+    private Integer orgId;
+
     /**
      * 小区ID
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 期区ID

src/main/java/com/huiju/estateagents/property/service/BuildingTreeServiceI.java

@@ -3,7 +3,6 @@ package com.huiju.estateagents.property.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpRoomNo;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -21,10 +20,11 @@ public interface BuildingTreeServiceI {
 	/**
 	 * 上传小区的基础数据
 	 * @param file
+	 * @param communityId
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean submitExcelData(MultipartFile file, TaUser userElement);
+	ResponseBean submitExcelData(MultipartFile file, Integer communityId, TaUser userElement);
 	
 	/**
 	 * 获取树形数据

src/main/java/com/huiju/estateagents/property/service/IBillService.java

@@ -86,7 +86,7 @@ public interface IBillService extends IService<Bill> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean downloadExcel(TaUser userElement,String phaseId,String buildingId);
+	ResponseBean downloadExcel(TaUser userElement, Integer communityId, String phaseId,String buildingId);
 
 	/**
 	 * 根据payType分页获取缴费或未缴费的数据

src/main/java/com/huiju/estateagents/property/service/IBuildingOwnerInfoService.java

@@ -3,7 +3,6 @@ package com.huiju.estateagents.property.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -62,17 +61,19 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      *   楼栋是根据 小区ID查询
      *
      * @param orgId
+     * @param communityId
      * @return
      */
-    ResponseBean getPhaseList(Integer orgId);
+    ResponseBean getPhaseList(Integer orgId, Integer communityId);
     
     /**
      * 上传excel里面的内容
      * @param file
+     * @param communityId
      * @param userElement
      * @return
      */
-    ResponseBean submitExcelData(MultipartFile file, TaUser userElement);
+    ResponseBean submitExcelData(MultipartFile file, Integer communityId, TaUser userElement);
 
     /**
      * 认证用户是否停用
@@ -115,10 +116,12 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
 
     /**
      * 下载Excel模板(小区楼栋信息)
+     *
+     * @param communityId
      * @param userElement
      * @return
      */
-    ResponseBean downloadExcel(TaUser userElement);
+    ResponseBean downloadExcel(Integer communityId, TaUser userElement);
     
     /**
      * 获取楼栋信息

src/main/java/com/huiju/estateagents/property/service/ITaUserCommunityService.java

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.property.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.property.entity.TaUserCommunity;
+import com.huiju.estateagents.property.entity.TpCommunity;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+public interface ITaUserCommunityService extends IService<TaUserCommunity> {
+
+    List<TpCommunity> getListBy(Integer orgId, Integer userId);
+
+    boolean addUserCommunity(Integer orgId, Integer userId, List<TpCommunity> communityList) throws Exception;
+}

src/main/java/com/huiju/estateagents/property/service/ITaUserVerifyService.java

@@ -16,6 +16,8 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
 
     /**
      * 查询 所有审核数据
+     *
+     * @param communityId
      * @param phone
      * @param userName
      * @param idCard
@@ -24,7 +26,7 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      * @param userElement
      * @return
      */
-    ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement);
+    ResponseBean selectAll(Integer communityId, String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement);
 
     /**
      * 审核 用户

src/main/java/com/huiju/estateagents/property/service/ITpCommunityService.java

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.property.service;
+
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+public interface ITpCommunityService extends IService<TpCommunity> {
+
+    List<TpCommunity> getAllByOrg(Integer orgId);
+}

src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java

@@ -608,7 +608,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     }
 
     @Override
-    public ResponseBean downloadExcel(TaUser userElement,String phaseId,String buildingId) {
+    public ResponseBean downloadExcel(TaUser userElement, Integer communityId, String phaseId,String buildingId) {
         ResponseBean responseBean = new ResponseBean();
 
         InputStream inputStream = null;
@@ -631,9 +631,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         Integer pageSize = 10;
         // 分页查询
 
-        List<TpRoomNo> records = tpRoomNoMapper.selectComunityList(userElement.getOrgId(), phaseId,buildingId,pageNum * pageSize, pageSize);
+        List<TpRoomNo> records = tpRoomNoMapper.selectComunityList(userElement.getOrgId(), communityId, phaseId,buildingId,pageNum * pageSize, pageSize);
         // 总页数
-        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId());
+        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId(), communityId);
 
 
         // 行数 默认从 第 6 行开始
@@ -662,7 +662,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 if (index == records.size()) {
                     index = 0;
                     pageNum ++;
-                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), pageNum * pageSize, pageSize);
+                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), communityId, pageNum * pageSize, pageSize);
                 }
                 if (records.isEmpty()) {
                     break;

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -13,8 +13,6 @@ import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
-import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.messagePush;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.exception.WisdomException;
 import com.huiju.estateagents.property.model.*;
@@ -24,13 +22,11 @@ import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -186,7 +182,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
 //         审核通过后，往楼栋资料库添加数据
         if ("1".equals(verify)) {
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(userVerify.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
                     userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getOrgId(), userElement.getUserId(),
                     userVerify.getGender(), userVerify.getOwnerName(), userVerify.getPhone(), userVerify.getIdCard());
 
@@ -251,7 +247,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 //        tpBuildingOwnerInfo.setOwnerName(appUser.getUserName());
 
         // 插入楼栋资料库
-        tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
+        tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(tpBuildingOwnerInfo.getCommunityId(), tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
                 tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), userElement.getOrgId(), userElement.getUserId(),
                 tpBuildingOwnerInfo.getGender(), tpBuildingOwnerInfo.getOwnerName(), tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getIdCard());
 
@@ -345,6 +341,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     /**
      * 插入 楼栋资料库
+     * @param communityId
      * @param phaseId
      * @param buildingId
      * @param unitId
@@ -356,9 +353,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * @param ownerName
      * @param ownerTel
      */
-    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo (Integer phaseId, Integer buildingId, Integer unitId,
-                                                           Integer levelId, Integer roomNoId, Integer orgId,
-                                                           Integer userId, String gender, String ownerName, String ownerTel, String idCard) {
+    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId,
+                                                          Integer levelId, Integer roomNoId, Integer orgId,
+                                                          Integer userId, String gender, String ownerName, String ownerTel, String idCard) {
         TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
 
         // 查询 期/楼栋/单元/层/户号
@@ -370,6 +367,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 主键是自增的, 所以设置为 null
         tpBuildingOwnerInfo.setId(null);
+        tpBuildingOwnerInfo.setCommunityId(communityId);
         tpBuildingOwnerInfo.setPhaseId(phaseId);
         tpBuildingOwnerInfo.setPhaseName(phase.getName());
         tpBuildingOwnerInfo.setBuildingId(buildingId);
@@ -390,8 +388,6 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         tpBuildingOwnerInfo.setCreateUser(userId);
         tpBuildingOwnerInfo.setVerifyStatus("0");
         tpBuildingOwnerInfo.setPairStatus("0");
-
-        // 添加的时候, 默认是当前操作的小区
         tpBuildingOwnerInfo.setOrgId(orgId);
 
         int row = tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
@@ -420,7 +416,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
 
     @Override
-    public ResponseBean getPhaseList(Integer orgId) {
+    public ResponseBean getPhaseList(Integer orgId, Integer communityId) {
 
         ResponseBean responseBean = new ResponseBean();
         if (null == orgId || "".equals(orgId)) {
@@ -430,6 +426,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Map<String, Object> map = Maps.newHashMap();
         // 小区
         map.put("org_id", orgId);
+        map.put("community_id", communityId);
         QueryWrapper<TpPhase> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map, false);
     
@@ -443,12 +440,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * 上传excel里面的内容
      *
      * @param file
+     * @param communityId
      * @param userElement
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean submitExcelData(MultipartFile file, TaUser userElement) {
+    public ResponseBean submitExcelData(MultipartFile file, Integer communityId, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = getExcelData(file);
 
@@ -465,6 +463,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             e.setOrgId(userElement.getOrgId());
             e.setVerifyStatus("0");
             e.setPairStatus("0");
+            e.setCommunityId(communityId);
             e.setCreateUser(userElement.getUserId());
             e.setCreateDate(LocalDateTime.now());
         });
@@ -977,7 +976,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public ResponseBean downloadExcel(TaUser userElement) {
+    public ResponseBean downloadExcel(Integer communityId, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         InputStream inputStream = null;
@@ -1000,9 +999,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Integer pageSize = 10;
 
         // 分页查询
-        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(),pageNum * pageSize, pageSize);
+        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), communityId,pageNum * pageSize, pageSize);
         // 总页数
-        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId());
+        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId(), communityId);
 
 
         // 行数 默认从 第 3 行开始
@@ -1051,7 +1050,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 if (index == records.size()) {
                     index = 0;
                     pageNum ++;
-                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(),pageNum * pageSize, pageSize);
+                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), communityId, pageNum * pageSize, pageSize);
                 }
                 if (records.isEmpty()) {
                     break;

src/main/java/com/huiju/estateagents/property/service/impl/BuildingTreeServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.Constant;
-import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.BuildingTreeServiceI;
@@ -180,11 +179,12 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	 * 上传小区的基础数据
 	 *
 	 * @param file
+	 * @param communityId
 	 * @param userElement
 	 * @return
 	 */
 	@Override
-	public ResponseBean submitExcelData(MultipartFile file, TaUser userElement) {
+	public ResponseBean submitExcelData(MultipartFile file, Integer communityId, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		responseBean = getExcelData(file);
 //		if (!responseBean.getCode().equals(Constant.RESPONSE_SUCCESS)){
@@ -198,7 +198,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		Integer orgId = userElement.getOrgId();
 		
 		//保存数据到表中--拆分数据
-		saveBuildingTreeData(orgId,list);
+		saveBuildingTreeData(orgId, communityId, list);
 		responseBean.addSuccess("success");
 		return responseBean;
 	}
@@ -296,6 +296,8 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		 String type= object.getString("type");
 		 //当前输入的节点内容
 		 String nodeNumber= object.getString("nodeNumber");
+		 // 小区
+		Integer communityId = object.getInteger("communityId");
 
 		/*查询出期*/
 		if(type.equals("phase")) {
@@ -311,6 +313,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			TpPhase tpPhase= new TpPhase();
 					tpPhase.setOrgId(orgId);
 					tpPhase.setName(nodeNumber);
+					tpPhase.setCommunityId(communityId);
 					tpPhase.setCreateDate(LocalDateTime.now());
 					tpPhaseMapper.insert(tpPhase);
 			return ResponseBean.success(tpPhase);
@@ -333,6 +336,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 						 .setPhaseId(tpPhase.getId())
 						 .setPhaseName(tpPhase.getName())
 						 .setName(nodeNumber)
+							.setCommunityId(communityId)
 						 .setCreateDate(LocalDateTime.now());
 			tpBuildingMapper.insert(tpBuilding);
 			return ResponseBean.success(tpBuilding);
@@ -358,6 +362,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 						.setBuildingName(selectTpBuilding.getName())
 						.setBuildingId(selectTpBuilding.getId())
 						.setName(nodeNumber)
+						.setCommunityId(communityId)
 						.setCreateDate(LocalDateTime.now());
 		 	 tpUnitMapper.insert(tpUnit);
 			return ResponseBean.success(tpUnit);
@@ -388,6 +393,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				.setUnitId(selectTpUnit.getId())
 				.setUnitName(selectTpUnit.getName())
 				.setName(nodeNumber)
+				.setCommunityId(communityId)
 				.setCreateDate(LocalDateTime.now());
 			 tpLevelMapper.insert(tpLevel);
 			return ResponseBean.success(tpLevel);
@@ -417,6 +423,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 							.setLevelId(selectTpLevel.getId())
 							.setLevelName(selectTpLevel.getName())
 							.setName(nodeNumber)
+					.setCommunityId(communityId)
 							.setCreateDate(LocalDateTime.now());
 			tpRoomNoMapper.insert(tpRoomNo);
 			return ResponseBean.success(tpRoomNo);
@@ -658,7 +665,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		return tpRoomNoMapper.getRoomNum(orgId);
 	}
 
-	private void saveBuildingTreeData(Integer orgId, List<TpBuildingOwnerInfo> list) {
+	private void saveBuildingTreeData(Integer orgId, Integer communityId, List<TpBuildingOwnerInfo> list) {
 		String lastPhaseName = "";
 		String lastBuildingName = "";
 		String lastUnitName = "";
@@ -676,9 +683,11 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpPhase.setName(tpBuildingOwnerInfo.getPhaseName());
 				tpPhase.setOrgId(orgId);
 				tpPhase.setCreateDate(LocalDateTime.now());
+			tpPhase.setCommunityId(communityId);
 
 				QueryWrapper<TpPhase> phaseQueryWrapper = new QueryWrapper<>();
 				phaseQueryWrapper.eq("org_id", orgId);
+			phaseQueryWrapper.eq("community_id", communityId);
 				phaseQueryWrapper.eq("`NAME`", tpBuildingOwnerInfo.getPhaseName());
 				TpPhase selectPhase = tpPhaseMapper.selectOne(phaseQueryWrapper);
 				// 判断是否存在库里
@@ -702,6 +711,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpBuilding.setPhaseName(lastPhaseName);
 				tpBuilding.setName(tpBuildingOwnerInfo.getBuildingName());
 				tpBuilding.setCreateDate(LocalDateTime.now());
+				tpBuilding.setCommunityId(communityId);
 
 				QueryWrapper<TpBuilding> buildingQueryWrapper = new QueryWrapper<>();
 				buildingQueryWrapper.eq("org_id", orgId);
@@ -726,6 +736,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpUnit.setBuildingName(lastBuildingName);
 				tpUnit.setName(tpBuildingOwnerInfo.getUnitName());
 				tpUnit.setCreateDate(LocalDateTime.now());
+				tpUnit.setCommunityId(communityId);
 
 				QueryWrapper<TpUnit> unitQueryWrapper = new QueryWrapper<>();
 				unitQueryWrapper.eq("org_id", orgId);
@@ -755,6 +766,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpLevel.setUnitName(lastUnitName);
 				tpLevel.setName(tpBuildingOwnerInfo.getLevelName());
 				tpLevel.setCreateDate(LocalDateTime.now());
+				tpLevel.setCommunityId(communityId);
 
 				QueryWrapper<TpLevel> levelQueryWrapper = new QueryWrapper<>();
 				levelQueryWrapper.eq("org_id", orgId);
@@ -786,6 +798,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpRoomNo.setLevelName(lastLevelName);
 				tpRoomNo.setName(tpBuildingOwnerInfo.getRoomNoName());
 				tpRoomNo.setCreateDate(LocalDateTime.now());
+				tpRoomNo.setCommunityId(communityId);
 
 				QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
 				roomNoQueryWrapper.eq("org_id", orgId);

src/main/java/com/huiju/estateagents/property/service/impl/TaUserCommunityServiceImpl.java

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.property.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.property.entity.TaUserCommunity;
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.huiju.estateagents.property.mapper.TaUserCommunityMapper;
+import com.huiju.estateagents.property.mapper.TpCommunityMapper;
+import com.huiju.estateagents.property.service.ITaUserCommunityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Service
+public class TaUserCommunityServiceImpl extends ServiceImpl<TaUserCommunityMapper, TaUserCommunity> implements ITaUserCommunityService {
+
+    @Autowired
+    TaUserCommunityMapper taUserCommunityMapper;
+
+    @Autowired
+    TpCommunityMapper tpCommunityMapper;
+
+    @Override
+    public List<TpCommunity> getListBy(Integer orgId, Integer userId) {
+        return tpCommunityMapper.getListOfUser(orgId, userId);
+    }
+
+    @Override
+    public boolean addUserCommunity(Integer orgId, Integer userId, List<TpCommunity> communityList) throws Exception {
+        if (null == orgId || null == userId || null == communityList) {
+            throw new Exception("未找到授权小区需要操作的记录");
+        }
+
+        // 先删除原有授权记录
+        QueryWrapper<TaUserCommunity> deleteQuery = new QueryWrapper<>();
+        deleteQuery.eq("org_id", orgId);
+        deleteQuery.eq("user_id", userId);
+        remove(deleteQuery);
+
+        // 新增记录
+        List<TaUserCommunity> list = new ArrayList<>();
+        for (TpCommunity community: communityList) {
+            TaUserCommunity userCommunity = new TaUserCommunity();
+            userCommunity.setOrgId(orgId);
+            userCommunity.setUserId(userId);
+            userCommunity.setCommunityId(community.getId());
+            list.add(userCommunity);
+        }
+
+        return saveBatch(list);
+    }
+}

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -12,7 +12,6 @@ import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
-import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.common.base.messagePush;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.exception.WisdomException;
@@ -20,15 +19,12 @@ import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.ITaUserVerifyService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -78,14 +74,14 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     private ApplicationContext applicationContext;
 
     @Override
-    public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement) {
+    public ResponseBean selectAll(Integer communityId, String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         Page<TaUserVerify> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
 
-        IPage<TaUserVerify> userVerifyIPage = taUserVerifyMapper.selectAllByPhoneAndUserNameAndIdCard(page, phone, userName, idCard, userElement.getOrgId());
+        IPage<TaUserVerify> userVerifyIPage = taUserVerifyMapper.selectAllByPhoneAndUserNameAndIdCard(page, communityId, phone, userName, idCard, userElement.getOrgId());
         responseBean.addSuccess(userVerifyIPage);
 
         return responseBean;

src/main/java/com/huiju/estateagents/property/service/impl/TpAnnouncementServiceImpl.java

@@ -65,6 +65,7 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
         Integer announcementNumber = jsonobject.getInteger("announcementNumber");
         Integer pageSize = jsonobject.getInteger("pageSize");
         String announcementTitle = jsonobject.getString("announcementTitle");
+
         tpAnnouncement.setId(announcementNumber);
         if (!StringUtils.isEmpty(announcementTitle)) {
             tpAnnouncement.setAnnouncementTitle(announcementTitle);

src/main/java/com/huiju/estateagents/property/service/impl/TpCommunityServiceImpl.java

@@ -0,0 +1,32 @@
+package com.huiju.estateagents.property.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.huiju.estateagents.property.mapper.TpCommunityMapper;
+import com.huiju.estateagents.property.service.ITpCommunityService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Service
+public class TpCommunityServiceImpl extends ServiceImpl<TpCommunityMapper, TpCommunity> implements ITpCommunityService {
+
+    @Override
+    public List<TpCommunity> getAllByOrg(Integer orgId) {
+        QueryWrapper<TpCommunity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+
+        return list(queryWrapper);
+    }
+}

src/main/resources/mapper/TaUserAuthMenuMapper.xml

@@ -19,7 +19,8 @@
         from
             sys_menu t
         where
-            t.menu_id in (
+            t.status = 1
+            and t.menu_id in (
                 SELECT
                     a.menu_id
                 from
@@ -43,7 +44,8 @@
         from
           sys_menu t
         where
-          t.app_type = 'estateagent-admin'
+          t.status = 1
+          and t.app_type = 'estateagent-admin'
           order by t.sort_num
     </select>
 

src/main/resources/mapper/TaUserMapper.xml

@@ -154,5 +154,37 @@
         AND t.status > -1
         Limit 1
     </select>
+    <select id="getLifeConsultants" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
+        SELECT
+            t.*,
+            m.score as average_score
+        FROM
+            ta_user t
+            INNER JOIN ta_user_community s ON s.user_id = t.user_id
+            LEFT JOIN (
+                SELECT
+                    a.user_id,
+                    avg( a.score ) AS score
+                FROM
+                    tp_life_consultant_evaluate a
+                WHERE
+                    a.org_id = 1
+                    AND a.evaluate_time = #{month}
+                GROUP BY
+                    a.user_id
+            ) m ON m.user_id = t.user_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.type = 'life-consultant'
+            AND s.community_id = #{communityId}
+        <if test="userName != null and userName != ''">
+            AND t.user_name LIKE CONCAT( '%', #{userName}, '%' )
+        </if>
+        <if test="phone != null and phone != ''">
+            AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+        </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 
 </mapper>

src/main/resources/mapper/property/AnnouncementTelMapper.xml

@@ -6,6 +6,10 @@
         FROM
             tp_announcement_tel t
         WHERE t.org_id = #{announcementTel.orgId}
+        and t.type = #{announcementTel.type}
+        <if test="announcementTel.communityId != null">
+            and t.community_id = #{announcementTel.communityId}
+        </if>
         <if test="announcementTel.tel != null and announcementTel.tel != ''">
           AND t.tel like concat('%',#{announcementTel.tel},'%')
         </if>

src/main/resources/mapper/property/TaUserCommunityMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.property.mapper.TaUserCommunityMapper">
+
+</mapper>

src/main/resources/mapper/property/TaUserVerifyMapper.xml

@@ -14,8 +14,9 @@
         from
           ta_user_verify tav
         <where>
+            tav.community_id = #{communityId}
             <trim suffixOverrides="and | or">
-                tav.verify_status = 0
+                and tav.verify_status = 0
                 <if test="phone != null and phone != ''">
                     and tav.phone like CONCAT('%',#{phone},'%')
                 </if>

src/main/resources/mapper/property/TpAnnouncementMapper.xml

@@ -11,6 +11,7 @@
    FROM
       tp_announcement
       <where>
+        community_id = #{record.communityId}
         <if test="record.id != null" >
           AND id like concat('%',#{record.id,jdbcType=VARCHAR},'%')
         </if>

src/main/resources/mapper/property/TpCommunityMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.property.mapper.TpCommunityMapper">
+
+    <select id="getListOfUser" resultType="com.huiju.estateagents.property.entity.TpCommunity">
+        SELECT DISTINCT
+            t.*
+        FROM
+            tp_community t
+            INNER JOIN ta_user_community s ON s.org_id = t.org_id
+            AND s.community_id = t.id
+        WHERE
+            s.org_id = #{orgId}
+            AND s.user_id = #{userId}
+    </select>
+</mapper>

src/main/resources/mapper/property/TpRoomNoMapper.xml

@@ -13,6 +13,7 @@
             INNER JOIN tp_phase q ON q.id = t.phase_id
         WHERE
             t.org_id = #{orgId}
+            AND t.community_id = #{communityId}
         LIMIT #{pageNum}, #{pageSize}
     </select>
     <select id="selectCommunityIdCount" resultType="java.lang.Long">
@@ -26,6 +27,7 @@
             INNER JOIN tp_phase q ON q.id = t.phase_id
         WHERE
             t.org_id = #{orgId}
+        AND t.community_id = #{communityId}
     </select>
     <select id="selectCommunityIdAndAddressName" resultType="com.huiju.estateagents.property.model.TpRoomNo">
         SELECT
@@ -71,6 +73,7 @@
         INNER JOIN tp_phase q ON q.id = t.phase_id
         WHERE
         t.org_id = #{orgId}
+        and t.community_id = #{communityId}
         <if test="phaseId != null and phaseId != ''" >
             and t.phase_id = #{phaseId,jdbcType=VARCHAR}
         </if>

src/main/resources/mapper/property/TpTicketMapper.xml

@@ -5,6 +5,7 @@
     SELECT
     p.id,
     p.org_id,
+        p.community_id,
     p.person_id,
     p.ticket_title,
     p.ticket_content,
@@ -23,6 +24,7 @@
     tp_ticket p
     LEFT JOIN ta_person AS us ON p.create_user=us.person_id
 <where>
+    p.community_id = #{ticket.communityId}
     <if test="ticket.id != null and ticket.id !=''">
         and  p.id like concat('%',#{ticket.id,jdbcType=INTEGER},'%')
     </if>