orgId

src/main/java/com/huiju/estateagents/property/common/UserElement.java

@@ -21,7 +21,7 @@ public class UserElement implements Serializable {
     private Integer id;
 
     /** 小区id **/
-    private Integer communityId;
+    private Integer orgId;
 
     /** 用户名 **/
     private String userName;
@@ -75,7 +75,7 @@ public class UserElement implements Serializable {
     public String toString() {
         return "UserElement{" +
                 "id=" + id +
-                ", communityId=" + communityId +
+                ", orgId=" + orgId +
                 ", userName='" + userName + '\'' +
                 ", loginName='" + loginName + '\'' +
                 ", email='" + email + '\'' +

src/main/java/com/huiju/estateagents/property/common/perproties/DaSuProperties.java

@@ -21,6 +21,6 @@ public class DaSuProperties {
 
     private String appSecret;
 
-    private String communityId;
+    private String orgId;
 
 }

src/main/java/com/huiju/estateagents/property/common/sign/DaSuSign.java

@@ -34,15 +34,15 @@ public class DaSuSign {
      * @param appSecret
      * @param datetime 时间戳
      * @param encrypt 加密方式(目前就 MD5)
-     * @param communityId 小区id
+     * @param orgId 小区id
      * @return
      */
-    public static String createSign(String appid, String appSecret, String datetime, String encrypt, String communityId){
+    public static String createSign(String appid, String appSecret, String datetime, String encrypt, String orgId){
         TreeMap<String ,Object> treeMap = Maps.newTreeMap();
         treeMap.put("appid", appid);
         treeMap.put("datetime", datetime);
         treeMap.put("encrypt", encrypt);
-        treeMap.put("communityid", communityId);
+        treeMap.put("communityid", orgId);
 
         String sign = "";
 

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

@@ -56,7 +56,7 @@ public class AnnouncementTelController extends BaseController {
 		ResponseBean responseBean = new ResponseBean();
 		TaUser userElement = getTaUser(request);
 		AnnouncementTel announcementTel = new AnnouncementTel();
-		announcementTel.setCommunityId(userElement.getOrgId());
+		announcementTel.setOrgId(userElement.getOrgId());
 		announcementTel.setName(name);
 		announcementTel.setTel(tel);
 		announcementTel.setRemark(remark);
@@ -81,14 +81,14 @@ public class AnnouncementTelController extends BaseController {
 		TaUser userElement = getTaUser(request);
 		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
 		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());
-		announcementTelQueryWrapper.eq("community_id", userElement.getOrgId());
+		announcementTelQueryWrapper.eq("org_id", userElement.getOrgId());
 		AnnouncementTel telServiceOne = announcementTelService.getOne(announcementTelQueryWrapper);
 		if (null != telServiceOne) {
 			responseBean.addError("此号码已存在");
 			return responseBean;
 		}
 		LocalDateTime time = LocalDateTime.now();
-		announcementTel.setCommunityId(userElement.getOrgId());
+		announcementTel.setOrgId(userElement.getOrgId());
 		announcementTel.setCreateUser(userElement.getUserId());
 		announcementTel.setUpdateUser(userElement.getUserId());
 		announcementTel.setCreateDate(time);
@@ -129,7 +129,7 @@ public class AnnouncementTelController extends BaseController {
 		TaUser userElement = getTaUser(request);
 		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
 		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());
-		announcementTelQueryWrapper.eq("community_id", userElement.getOrgId());
+		announcementTelQueryWrapper.eq("org_id", userElement.getOrgId());
 		AnnouncementTel telServiceOne = announcementTelService.getOne(announcementTelQueryWrapper);
 		if (null != telServiceOne && announcementTel.getTel().equals(telServiceOne.getTel()) && announcementTel.getId().equals(telServiceOne.getId())) {
 			announcementTel.setUpdateUser(userElement.getUserId());

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

@@ -63,7 +63,7 @@ public class BillController extends BaseController {
         bill.setId(billId);
         bill.setBillName(billName);
         bill.setBillExplain(billExplain);
-        bill.setCommunityId(userElement.getOrgId());
+        bill.setOrgId(userElement.getOrgId());
         responseBean = iBillService.getBillList(bill,pageNum,pageSize);
         return responseBean;
     }

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

@@ -50,7 +50,7 @@ public class CarouselSettingController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         QueryWrapper<TpCarouselSetting> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("community_id", userElement.getOrgId());
+        queryWrapper.eq("org_id", userElement.getOrgId());
         queryWrapper.eq("carousel_type","announcement");
         TpCarouselSetting one = iCarouselSettingService.getOne(queryWrapper);
         Integer carouselNum = JSONObject.parseObject(parameter).getInteger("carouselNum");
@@ -63,7 +63,7 @@ public class CarouselSettingController extends BaseController {
             one = new TpCarouselSetting();
             one.setCarouselNum(carouselNum);
             one.setCarouselType("announcement");
-            one.setCommunityId(userElement.getOrgId());
+            one.setOrgId(userElement.getOrgId());
             // 添加
             b = iCarouselSettingService.save(one);
 
@@ -87,7 +87,7 @@ public class CarouselSettingController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         QueryWrapper<TpCarouselSetting> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("community_id", userElement.getOrgId());
+        queryWrapper.eq("org_id", userElement.getOrgId());
         queryWrapper.eq("carousel_type","activity");
         TpCarouselSetting one = iCarouselSettingService.getOne(queryWrapper);
         Integer carouselNum = JSONObject.parseObject(parameter).getInteger("carouselNum");
@@ -98,7 +98,7 @@ public class CarouselSettingController extends BaseController {
         } else {
             one = new TpCarouselSetting();
             one.setCarouselType("activity");
-            one.setCommunityId(userElement.getOrgId());
+            one.setOrgId(userElement.getOrgId());
             one.setCarouselNum(carouselNum);
             b = iCarouselSettingService.save(one);
         }
@@ -121,12 +121,12 @@ public class CarouselSettingController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         QueryWrapper<TpCarouselSetting> activityQueryWrapper = new QueryWrapper<>();
-        activityQueryWrapper.eq("community_id", userElement.getOrgId());
+        activityQueryWrapper.eq("org_id", userElement.getOrgId());
         activityQueryWrapper.eq("carousel_type","activity");
         TpCarouselSetting activityOne = iCarouselSettingService.getOne(activityQueryWrapper);
 
         QueryWrapper<TpCarouselSetting> announcementQueryWrapper = new QueryWrapper<>();
-        announcementQueryWrapper.eq("community_id", userElement.getOrgId());
+        announcementQueryWrapper.eq("org_id", userElement.getOrgId());
         announcementQueryWrapper.eq("carousel_type","announcement");
         TpCarouselSetting announcementOne = iCarouselSettingService.getOne(announcementQueryWrapper);
 

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

@@ -61,13 +61,13 @@ public class TpShopTypeController extends BaseController {
 	public ResponseBean saveShopType(@RequestBody TpShopType shopType, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
 		TaUser userElement = getTaUser(request);
-		shopType.setCommunityId(userElement.getOrgId());
+		shopType.setOrgId(userElement.getOrgId());
 		shopType.setSource("self");
 		shopType.setCreateUser(userElement.getUserId());
 		shopType.setCreateDate(LocalDateTime.now());
 		//查看索引是否存在
 		QueryWrapper<TpShopType> shopTypeQueryWrapper = new QueryWrapper<>();
-		shopTypeQueryWrapper.eq("community_id",shopType.getCommunityId());
+		shopTypeQueryWrapper.eq("org_id",shopType.getOrgId());
 		shopTypeQueryWrapper.eq("sort",shopType.getSort());
 		List<TpShopType> list = shopTypeService.list(shopTypeQueryWrapper);
 		if (list.size() > 0){
@@ -108,7 +108,7 @@ public class TpShopTypeController extends BaseController {
 		TaUser userElement = getTaUser(request);
 		//查看索引是否存在
 		QueryWrapper<TpShopType> shopTypeQueryWrapper = new QueryWrapper<>();
-		shopTypeQueryWrapper.eq("community_id",userElement.getOrgId());
+		shopTypeQueryWrapper.eq("org_id",userElement.getOrgId());
 		shopTypeQueryWrapper.eq("sort",shopType.getSort());
 		shopTypeQueryWrapper.ne("id",shopType.getId());
 		List<TpShopType> list = shopTypeService.list(shopTypeQueryWrapper);
@@ -150,7 +150,7 @@ public class TpShopTypeController extends BaseController {
 		ResponseBean responseBean = new ResponseBean();
 		TaUser userElement = getTaUser(request);
 		QueryWrapper<TpShopType> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("community_id",userElement.getOrgId());
+		queryWrapper.eq("org_id",userElement.getOrgId());
 		queryWrapper.orderByAsc("sort");
 		queryWrapper.orderByAsc("create_date");
 		responseBean.addSuccess(shopTypeService.list(queryWrapper));

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

@@ -20,5 +20,5 @@ public interface HotelMapper extends BaseMapper<Hotel> {
      * 查询酒店，当前小区酒店只有一个
      * @return
      */
-    Hotel selectHotel(@Param("communityId") Integer communityId);
+    Hotel selectHotel(@Param("orgId") Integer orgId);
 }

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

@@ -25,8 +25,8 @@ public interface HotelRoomMapper extends BaseMapper<HotelRoom> {
      * @param hotelRoom
      * @param beginTime
      * @param endTime
-     * @param communityId
+     * @param orgId
      * @return
      */
-    IPage<HotelRoom> hotelRoomLiset(Page HotelRoom, @Param("hotelRoom") HotelRoom hotelRoom, @Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("communityId") Integer communityId);
+    IPage<HotelRoom> hotelRoomLiset(Page HotelRoom, @Param("hotelRoom") HotelRoom hotelRoom, @Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("orgId") Integer orgId);
 }

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

@@ -10,34 +10,34 @@ import java.util.List;
 public interface IndexCountMapper {
 	/**
 	 * 获取工单统计
-	 * @param communityId
+	 * @param orgId
 	 * @return
 	 */
-	List<TpTicket> getTicketList(@Param("communityId") Integer communityId);
+	List<TpTicket> getTicketList(@Param("orgId") Integer orgId);
 	
 	Integer selectCommunityOpenDoorCount();
 	
 	Integer selectUnitsOpenDoorCount(Integer eventType);
 	
-	Integer getPublicCameraCount(@Param("communityId") Integer communityId);
+	Integer getPublicCameraCount(@Param("orgId") Integer orgId);
 	
-	Integer getRemoteMonitoringCount(@Param("communityId") Integer communityId);
+	Integer getRemoteMonitoringCount(@Param("orgId") Integer orgId);
 	
-	Integer getRemoteUnitCount(@Param("communityId") Integer communityId);
+	Integer getRemoteUnitCount(@Param("orgId") Integer orgId);
 	
-	List<TpBillInvoiceCount> getBillInvoiceCountList(@Param("communityId") Integer communityId);
+	List<TpBillInvoiceCount> getBillInvoiceCountList(@Param("orgId") Integer orgId);
 	
-	List<TaUserLicenseCount> getUserLicenseCountList(@Param("communityId") Integer communityId);
+	List<TaUserLicenseCount> getUserLicenseCountList(@Param("orgId") Integer orgId);
 	
-	List<TaTemporaryLicenseCount> getTemporaryLicenseCountList(@Param("communityId") Integer communityId);
+	List<TaTemporaryLicenseCount> getTemporaryLicenseCountList(@Param("orgId") Integer orgId);
 	
-	Integer getRegisterUserCount(@Param("communityId") Integer communityId, @Param("roleId") Integer roleId);
+	Integer getRegisterUserCount(@Param("orgId") Integer orgId, @Param("roleId") Integer roleId);
 	
-	List<TaBriskUser> getBriskUserList(@Param("communityId") Integer communityId);
+	List<TaBriskUser> getBriskUserList(@Param("orgId") Integer orgId);
 	
-	Integer getAnnouncementCount(@Param("communityId") Integer communityId);
+	Integer getAnnouncementCount(@Param("orgId") Integer orgId);
 	
-	Integer getActivityCount(@Param("communityId") Integer communityId);
+	Integer getActivityCount(@Param("orgId") Integer orgId);
 	
-	Integer getTopicCount(@Param("communityId") Integer communityId);
+	Integer getTopicCount(@Param("orgId") Integer orgId);
 }

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

@@ -20,5 +20,5 @@ import java.util.List;
 public interface RoleMapper extends BaseMapper<SysRole> {
 	List<SysRole> getRoleListByParams(Page page, @Param("role") SysRole role);
 
-	SysRole selectByRoleName(@Param("roleName") String roleName, @Param("communityId") Integer communityId);
+	SysRole selectByRoleName(@Param("roleName") String roleName, @Param("orgId") Integer orgId);
 }

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

@@ -19,9 +19,9 @@ public interface TaSysMenuMapper extends BaseMapper<TaSysMenu> {
 
     /**
      * 根据小区查询出APP菜单列表
-     * @param communityId
+     * @param orgId
      * @return
      */
-    List<TaSysMenu> selectList(Integer communityId);
+    List<TaSysMenu> selectList(Integer orgId);
 
 }

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

@@ -19,11 +19,11 @@ public interface TaSysUserRoleMapper extends BaseMapper<TaSysUserRole> {
 
     /**
      * 根据 用户id 和 小区Id  删除数据
-     * @param communityId
+     * @param orgId
      * @param userId
      * @return
      */
-    @Delete("delete from ta_sys_user_role where community_id=#{communityId} and user_id=#{userId}")
-    int deleteByCommunityIdAndUserId(@Param("communityId") Integer communityId, @Param("userId") Integer userId);
+    @Delete("delete from ta_sys_user_role where community_id=#{orgId} and user_id=#{userId}")
+    int deleteByCommunityIdAndUserId(@Param("orgId") Integer orgId, @Param("userId") Integer userId);
 
 }

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

@@ -23,23 +23,23 @@ public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder>
 
     /**
      * 分页查询
-     * @param communityId
+     * @param orgId
      * @param pageNum
      * @param pageSize
      * @return
      */
     @ResultType(TaUserLicenseOrder.class)
-    @Select("select * from ta_user_license_order where community_id = #{communityId} limit #{pageNum},#{pageSize}")
-    List<TaUserLicenseOrder> getLicensePage(@Param("communityId") Integer communityId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+    @Select("select * from ta_user_license_order where community_id = #{orgId} limit #{pageNum},#{pageSize}")
+    List<TaUserLicenseOrder> getLicensePage(@Param("orgId") Integer orgId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     /**
      * 查询总数
-     * @param communityId
+     * @param orgId
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(*) from ta_user_license_order where community_id = #{communityId}")
-    Integer getCount(@Param("communityId") Integer communityId);
+    @Select("select count(*) from ta_user_license_order where community_id = #{orgId}")
+    Integer getCount(@Param("orgId") Integer orgId);
     
     
     List<Map<String, Object>> getPriceCount();

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

@@ -30,11 +30,11 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      * @param idCard
      * @return
      */
-    IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard, @Param("communityId") Integer communityId);
+    IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard, @Param("orgId") Integer orgId);
 
     /**
      * 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
-     * @param communityId
+     * @param orgId
      * @param phaseId
      * @param buildingId
      * @param unitId
@@ -42,11 +42,11 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      * @param roomNoId
      * @return
      */
-    TaUserVerify selectCommunityAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId);
+    TaUserVerify selectCommunityAndAddress(@Param("orgId") Integer orgId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId);
 
     /**
      * 根据 用户id、小区id 、 小区、期、栋、单元、楼层、户号、角色id 进行条件查询出
-     * @param communityId
+     * @param orgId
      * @param phaseId
      * @param buildingId
      * @param unitId
@@ -54,12 +54,12 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      * @param roomNoId
      * @return
      */
-    TaUserVerify selectCommunityAndAddressAndRoleId(@Param("userId") Integer userId, @Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("roleId") Integer roleId);
+    TaUserVerify selectCommunityAndAddressAndRoleId(@Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("roleId") Integer roleId);
 
 
     /**
      * 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
-     * @param communityId
+     * @param orgId
      * @param phaseName
      * @param buildingName
      * @param unitName
@@ -69,7 +69,7 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      */
     @ResultType(TaUserVerify.class)
     @Select("select  *  from ta_user_verify " +
-            "where community_id = #{communityId} " +
+            "where community_id = #{orgId} " +
             "and phase_name = #{phaseName} " +
             "and building_name = #{buildingName} " +
             "and unit_name = #{unitName} " +
@@ -77,13 +77,13 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
             "and room_no_name = #{roomNoName} " +
             "and verify_status = 1 " +
             "and role_id = 1")
-    TaUserVerify selectCommunityAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
+    TaUserVerify selectCommunityAndAddressName(@Param("orgId") Integer orgId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
 
 
     /**
      * 查询用户审核数据！   小区id，用户id，期id，栋id，单元id，楼层id，房间id，审核状态
      * @param userId
-     * @param communityId
+     * @param orgId
      * @param phaseId
      * @param buildingId
      * @param unitId
@@ -93,7 +93,7 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      * @return
      */
     List<TaUserVerify> selectUserVerifyCommunityAndAddress(@Param("userId") Integer userId,
-                                                           @Param("communityId") Integer communityId,
+                                                           @Param("orgId") Integer orgId,
                                                            @Param("phaseId") Integer phaseId,
                                                            @Param("buildingId") Integer buildingId,
                                                            @Param("unitId") Integer unitId,

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

@@ -16,7 +16,7 @@ public interface TpAnnouncementMapper extends BaseMapper<TpAnnouncement> {
 
     int insert(TpAnnouncement record);
 
-    TpAnnouncement selectByPrimaryKey(@Param("id") Integer id, @Param("communityId") Integer communityId);
+    TpAnnouncement selectByPrimaryKey(@Param("id") Integer id, @Param("orgId") Integer orgId);
 
     int updateByPrimaryKeySelective(@Param("id") Integer id, @Param("viewCount") Integer viewCount);
 
@@ -28,9 +28,9 @@ public interface TpAnnouncementMapper extends BaseMapper<TpAnnouncement> {
 
     /**
      * 公告轮播图
-     * @param communityId
+     * @param orgId
      * @param sum
      * @return
      */
-    List<TpAnnouncement> getAnnouncement(@Param("communityId") Integer communityId, @Param("sum") Integer sum);
+    List<TpAnnouncement> getAnnouncement(@Param("orgId") Integer orgId, @Param("sum") Integer sum);
 }

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

@@ -39,7 +39,7 @@ public interface TpBillOrderMapper extends BaseMapper<TpBillOrder> {
     @ResultType(TpBillOrder.class)
     @Select("select " +
             "tbo.id as id, " +
-            "tbo.community_id as communityId, " +
+            "tbo.community_id as orgId, " +
             "tbo.tp_bill_id as tpBillId, " +
             "tbo.tp_bill_invoice_id as tpBillInvoiceId, " +
             "tbo.order_bumber as orderBumber, " +

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

@@ -36,7 +36,7 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
 
     /**
      * 更具 小区、期、楼栋、单元、楼层、户号、手机号 查询
-     * @param communityId
+     * @param orgId
      * @param phaseId
      * @param buildingId
      * @param unitId
@@ -47,19 +47,19 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
      */
 	@ResultType(TpBuildingOwnerInfo.class)
 	@Select("select * FROM tp_building_owner_info tpio " +
-            "WHERE tpio.community_id = #{communityId} " +
+            "WHERE tpio.community_id = #{orgId} " +
             "and tpio.phase_id = #{phaseId} " +
             "and tpio.building_id = #{buildingId} " +
             "and tpio.unit_id = #{unitId} " +
             "and tpio.level_id = #{levelId} " +
             "AND tpio.room_no_id = #{roomNoId} " +
             "AND tpio.owner_tel = #{ownerTel}")
-    TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("ownerTel") String ownerTel);
+    TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("orgId") Integer orgId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("ownerTel") String ownerTel);
 
 
     /**
      * 更具 小区、期、楼栋、单元、楼层、户号、手机号 查询
-     * @param communityId
+     * @param orgId
      * @param phaseName
      * @param buildingName
      * @param unitName
@@ -70,14 +70,14 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
      */
     @ResultType(TpBuildingOwnerInfo.class)
     @Select("select * FROM tp_building_owner_info tpio " +
-            "WHERE tpio.community_id = #{communityId} " +
+            "WHERE tpio.community_id = #{orgId} " +
             "and tpio.phase_name = #{phaseName} " +
             "and tpio.building_name = #{buildingName} " +
             "and tpio.unit_name = #{unitName} " +
             "and tpio.level_name = #{levelName} " +
             "AND tpio.room_no_name = #{roomNoName} " +
             "AND tpio.owner_tel = #{ownerTel}")
-    TpBuildingOwnerInfo selectCommunityIdAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") Integer buildingName, @Param("unitName") Integer unitName, @Param("levelName") Integer levelName, @Param("roomNoName") Integer roomNoName, @Param("ownerTel") String ownerTel);
+    TpBuildingOwnerInfo selectCommunityIdAndAddressName(@Param("orgId") Integer orgId, @Param("phaseName") String phaseName, @Param("buildingName") Integer buildingName, @Param("unitName") Integer unitName, @Param("levelName") Integer levelName, @Param("roomNoName") Integer roomNoName, @Param("ownerTel") String ownerTel);
 
 
 }

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

@@ -22,7 +22,7 @@ public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
 
     /**
      * 根据小区id 和 类型查询
-     * @param communityId
+     * @param orgId
      * @param equipmentType
      * @return
      */
@@ -36,13 +36,13 @@ public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
             "(select configuration_value FROM tp_configuration WHERE id = tm.uuid_id)as uuid " +
             "FROM " +
             "tp_equipment tm " +
-            "where tm.community_id = #{communityId} and tm.equipment_type = #{equipmentType}")
-    List<TpEquipment> selectAllByCommunityAndEquipmentType(@Param("communityId") Integer communityId, @Param("equipmentType") Integer equipmentType);
+            "where tm.community_id = #{orgId} and tm.equipment_type = #{equipmentType}")
+    List<TpEquipment> selectAllByCommunityAndEquipmentType(@Param("orgId") Integer orgId, @Param("equipmentType") Integer equipmentType);
 
 
     /**
      * 根据小区id 和 类型查询 和 设备id
-     * @param communityId
+     * @param orgId
      * @param equipmentType
      * @return
      */
@@ -56,8 +56,8 @@ public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
             "(select configuration_value FROM tp_configuration WHERE id = tm.uuid_id)as uuid " +
             "FROM " +
             "tp_equipment tm " +
-            "where tm.community_id = #{communityId} and tm.equipment_type = #{equipmentType} and tm.id = #{monitoringId}")
-    TpEquipment getMonitoringById(@Param("communityId") Integer communityId, @Param("equipmentType") Integer equipmentType, @Param("monitoringId") Integer monitoringId);
+            "where tm.community_id = #{orgId} and tm.equipment_type = #{equipmentType} and tm.id = #{monitoringId}")
+    TpEquipment getMonitoringById(@Param("orgId") Integer orgId, @Param("equipmentType") Integer equipmentType, @Param("monitoringId") Integer monitoringId);
 
 
 }

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

@@ -23,7 +23,7 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
 
     /**
      * 根据 小区，期，栋，单元，楼层，房间  查询房间信息
-     * @param communityId
+     * @param orgId
      * @param phaseName
      * @param buildingName
      * @param unitName
@@ -33,13 +33,13 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      */
     @ResultType(TpRoomNo.class)
     @Select("select * from tp_room_no " +
-            "where community_id = #{communityId} " +
+            "where community_id = #{orgId} " +
             "and phase_name = #{phaseName} " +
             "and building_name = #{buildingName} " +
             "and unit_name = #{unitName} " +
             "and level_name = #{levelName} " +
             "and name = #{roomNoName}")
-    TpRoomNo selectCommunityIdAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
+    TpRoomNo selectCommunityIdAndAddressName(@Param("orgId") Integer orgId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
 
     /**
      * 查询数据，分页
@@ -48,16 +48,16 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      * @return
      */
     @ResultType(TpRoomNo.class)
-    @Select("select * from tp_room_no where community_id = #{communityId} limit #{pageNum},#{pageSize}")
-    List<TpRoomNo> selectCommunityIdList(@Param("communityId") Integer communityId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+    @Select("select * from tp_room_no where community_id = #{orgId} limit #{pageNum},#{pageSize}")
+    List<TpRoomNo> selectCommunityIdList(@Param("orgId") Integer orgId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     /**
      * 查询数据，分页
-     * @param communityId
+     * @param orgId
      * @return
      */
     @ResultType(Long.class)
-    @Select("select count(1) from tp_room_no where community_id = #{communityId}")
-    Long selectCommunityIdCount(@Param("communityId") Integer communityId);
+    @Select("select count(1) from tp_room_no where community_id = #{orgId}")
+    Long selectCommunityIdCount(@Param("orgId") Integer orgId);
 
 }

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

@@ -28,7 +28,7 @@ public interface TpSysRoleMapper extends BaseMapper<TpSysRole> {
 
     /**
      * 得到所有角色
-     * @param communityId
+     * @param orgId
      */
-    List<TpSysRole> allUserRole(@Param("communityId") Integer communityId);
+    List<TpSysRole> allUserRole(@Param("orgId") Integer orgId);
 }

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

@@ -19,6 +19,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TpTicketMapper extends BaseMapper<TpTicket> {
 
-    IPage<TpTicket> ticketList(Page page, @Param("ticket") TpTicket ticket, @Param("userName") String UserNmae, @Param("updateUserNmae") String updateUserNmae, @Param("communityId") Integer communityId);
+    IPage<TpTicket> ticketList(Page page, @Param("ticket") TpTicket ticket, @Param("userName") String UserNmae, @Param("updateUserNmae") String updateUserNmae, @Param("orgId") Integer orgId);
     TpTicketVO ticketDetails(@Param("id") Integer id);
 }

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

@@ -20,7 +20,7 @@ import java.util.List;
 @Mapper
 public interface TpTransactionMapper extends BaseMapper<TpTransaction> {
 
-	List<TpTransaction> selectListByParams(Page page, @Param("transactionTitle") String transactionTitle, @Param("userName") String userName, @Param("id") Integer id, @Param("status") String status, @Param("communityId") Integer communityId);
+	List<TpTransaction> selectListByParams(Page page, @Param("transactionTitle") String transactionTitle, @Param("userName") String userName, @Param("id") Integer id, @Param("status") String status, @Param("orgId") Integer orgId);
 
 
     /**

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

@@ -23,7 +23,7 @@ import java.util.Map;
 public interface UserMapper extends BaseMapper<User> {
     String selectByIdUserName(@Param("id") Integer id);
 
-    IPage<User> userList(Page page, @Param("loginName") String loginName, @Param("userName") String userName, @Param("communityId") Integer communityId);
+    IPage<User> userList(Page page, @Param("loginName") String loginName, @Param("userName") String userName, @Param("orgId") Integer orgId);
 
 
     void updateByPrimaryKeySelective(User user);
@@ -46,10 +46,10 @@ public interface UserMapper extends BaseMapper<User> {
     /**
      * 获取此用户的权限信息
      * @param userId
-     * @param communityId
+     * @param orgId
      * @return
      */
-	List<Map<String, Object>> getPermission(@Param("userId") Integer userId, @Param("communityId") Integer communityId);
+	List<Map<String, Object>> getPermission(@Param("userId") Integer userId, @Param("orgId") Integer orgId);
     
     /**
      * 获取父权限
@@ -61,8 +61,8 @@ public interface UserMapper extends BaseMapper<User> {
     /**
      * 获取所有物业人员并排除自身
      * @param id
-     * @param communityId
+     * @param orgId
      * @return
      */
-    List<User> getUser(@Param("id") Integer id, @Param("communityId") Integer communityId);
+    List<User> getUser(@Param("id") Integer id, @Param("orgId") Integer orgId);
 }

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

@@ -34,7 +34,7 @@ public class AnnouncementTel implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 电话名称

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

@@ -32,7 +32,7 @@ public class Bill implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 收费项名称

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

@@ -33,7 +33,7 @@ public class BillInvoice implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 收费项id

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

@@ -33,7 +33,7 @@ public class BillStatement implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 缴费单id

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

@@ -31,7 +31,7 @@ public class Hotel implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 酒店电话

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

@@ -33,7 +33,7 @@ public class HotelRoom implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 酒店ID

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

@@ -27,7 +27,7 @@ public class HotelSetting implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 创建时间

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

@@ -33,7 +33,7 @@ public class Message implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 消息类型  1：投诉   2：报修 3：联系物业  4： 访客  5:公告  6:系统通知  7:账单 8:活动

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

@@ -29,7 +29,7 @@ public class SysMenu implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 菜单名称

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

@@ -30,7 +30,7 @@ public class SysRole implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 角色名称

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

@@ -25,7 +25,7 @@ public class SysRoleMenu implements Serializable {
 
     private Integer id;
     
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 角色ID

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

@@ -23,7 +23,7 @@ public class SysUserRole implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 用户ID

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

@@ -18,7 +18,7 @@ public class TaBriskUser {
 	
 	private Integer id;
 	
-	private Integer communityId;
+	private Integer orgId;
 	
 	private Integer taUserVerifyId;
 	

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

@@ -31,7 +31,7 @@ public class TaFace implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 用户审核表id

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

@@ -27,7 +27,7 @@ public class TaSysMenu implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 菜单名称

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

@@ -31,7 +31,7 @@ public class TaSysUserRole implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 用户ID

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

@@ -25,7 +25,7 @@ public class TaTemporaryLicenseCount implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 价格总和

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

@@ -25,7 +25,7 @@ public class TaUserLicenseCount implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 价格总和

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

@@ -32,7 +32,7 @@ public class TaUserLicenseOrder implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 人员ID

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

@@ -36,7 +36,7 @@ public class TaUserVerify implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 角色ID

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

@@ -32,7 +32,7 @@ public class TaVisitorLicenseSetting implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 创建时间

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

@@ -34,7 +34,7 @@ public class TpActivity implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 活动标题

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

@@ -24,7 +24,7 @@ public class TpActivitySignIn implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 活动ID

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

@@ -29,7 +29,7 @@ public class TpActivitySignUp implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 活动id

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

@@ -21,7 +21,7 @@ public class TpAnnouncement implements Serializable {
     private Integer id;
 
     /** 小区id**/
-    private Integer communityId;
+    private Integer orgId;
 
     /**公告标题**/
     private String announcementTitle;

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

@@ -25,7 +25,7 @@ public class TpBillInvoiceCount implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 价格总和

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

@@ -34,7 +34,7 @@ public class TpBillOrder implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 缴费项ID

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

@@ -19,7 +19,7 @@ public class TpBuilding implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
     
     /**
      * 期区id

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

@@ -36,7 +36,7 @@ public class TpBuildingOwnerInfo implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
     
     /**
      * 身份证号码

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

@@ -31,7 +31,7 @@ public class TpCarouselSetting implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 轮播类型： announcement 表示公告  activity 表示活动  banner表示运营banner

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

@@ -74,7 +74,7 @@ public class TpConfiguration implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 设备id

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

@@ -38,7 +38,7 @@ public class TpEquipment implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 安保人员电话，对应 配置tp_configuration 表id

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

@@ -32,7 +32,7 @@ public class TpEquipmentTree implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 名称

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

@@ -25,7 +25,7 @@ public class TpHotelImg implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 酒店ID

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

@@ -32,7 +32,7 @@ public class TpLevel implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 期区ID

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

@@ -32,7 +32,7 @@ public class TpPhase implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 期区名称

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

@@ -32,7 +32,7 @@ public class TpRentalHouse implements Serializable {
     /**
      * 我们系统的小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 房间名称

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

@@ -25,7 +25,7 @@ public class TpRentalHouseImg implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 出租房间ID

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

@@ -32,7 +32,7 @@ public class TpRoomNo implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 期区ID

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

@@ -32,7 +32,7 @@ public class TpShop implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 商铺名称

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

@@ -25,7 +25,7 @@ public class TpShopImg implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 商铺ID

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

@@ -30,7 +30,7 @@ public class TpShopSetting implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 创建时间

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

@@ -30,7 +30,7 @@ public class TpShopType implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 类型名称

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

@@ -31,7 +31,7 @@ public class TpSysRole implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 角色名称

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

@@ -34,7 +34,7 @@ public class TpTicket implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 住户app的id

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

@@ -34,7 +34,7 @@ public class TpTicketRecord implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 工单id

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

@@ -34,7 +34,7 @@ public class TpTicketRecordComment implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 工单id

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

@@ -30,7 +30,7 @@ public class TpTransaction implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
     
     /**
      * 身份ID 根据uuid_type区分是物业端TP_USER_ID还是TA_USER_VERIFY_ID

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

@@ -32,7 +32,7 @@ public class TpUnit implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 期区ID

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

@@ -28,7 +28,7 @@ public class TpUserCommunity implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 物业端用户id

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

@@ -27,7 +27,7 @@ public class TransactionLike implements Serializable {
     /**
      * 小区ID
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 住户端App用户ID

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

@@ -33,7 +33,7 @@ public class TransactionReply implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
     
     /**
      * 交易帖子ID

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

@@ -28,7 +28,7 @@ public class TransactionReport implements Serializable {
     /**
      * 小区id
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 二手交易id

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

@@ -32,7 +32,7 @@ public class User implements Serializable {
     /**
      * 小区id, 这字段作废不使用
      */
-    private Integer communityId;
+    private Integer orgId;
 
     /**
      * 用户姓名

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

@@ -24,26 +24,26 @@ public interface BuildingTreeServiceI {
 	
 	/**
 	 * 获取树形数据
-	 * @param communityId
+	 * @param orgId
 	 * @param id
 	 * @param treeType
 	 * @return
 	 */
-	ResponseBean getTreeList(Integer communityId, Integer id, String treeType);
+	ResponseBean getTreeList(Integer orgId, Integer id, String treeType);
 
 	/**
 	 * 添加当前节点
 	 * @param parameter
-	 * @param communityId
+	 * @param orgId
 	 * @return
 	 */
-    ResponseBean addNode(String parameter, Integer communityId);
+    ResponseBean addNode(String parameter, Integer orgId);
 
 	/**
 	 * 当删除前节点
 	 * @param parameter
-	 * @param communityId
+	 * @param orgId
 	 * @return
 	 */
-	ResponseBean deleteNode(String parameter, Integer communityId);
+	ResponseBean deleteNode(String parameter, Integer orgId);
 }

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

@@ -60,10 +60,10 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      *
      *   楼栋是根据 小区ID查询
      *
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean getPhaseList(Integer communityId);
+    ResponseBean getPhaseList(Integer orgId);
     
     /**
      * 上传excel里面的内容
@@ -99,18 +99,18 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
     /**
      * 小区楼栋资料表-查询 楼栋/单元/楼层/户号
      * @param parameter
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean puildinghouse(String parameter, Integer communityId);
+    ResponseBean puildinghouse(String parameter, Integer orgId);
 
     /**
      *
      * @param parameter
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean communitybuildingUpdate(String parameter, Integer communityId);
+    ResponseBean communitybuildingUpdate(String parameter, Integer orgId);
 
     /**
      * 下载Excel模板(小区楼栋信息)
@@ -122,34 +122,34 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
     /**
      * 获取楼栋信息
      * @param phaseId
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean getBuildingList(Integer phaseId, Integer communityId);
+    ResponseBean getBuildingList(Integer phaseId, Integer orgId);
     
     /**
      * 获取单元信息
      * @param buildingId
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean getUnitList(Integer buildingId, Integer communityId);
+    ResponseBean getUnitList(Integer buildingId, Integer orgId);
     
     /**
      * 获取楼层信息
      * @param unitId
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean getLevelList(Integer unitId, Integer communityId);
+    ResponseBean getLevelList(Integer unitId, Integer orgId);
     
     /**
      * 获取室号信息
      * @param levelId
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean getRoomNoList(Integer levelId, Integer communityId);
+    ResponseBean getRoomNoList(Integer levelId, Integer orgId);
 
     /**
      * 查看住户详情

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

@@ -19,10 +19,10 @@ public interface IHotelService extends IService<Hotel> {
     /**
      * 房间列表
      * @param parameter
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean hotelRoomLiset(String parameter, Integer communityId);
+    ResponseBean hotelRoomLiset(String parameter, Integer orgId);
 
     /**
      * 添加房间

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

@@ -16,19 +16,19 @@ public interface IMessageService extends IService<Message> {
     /**
      * 查询消息待办列表
      * @param parameter
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean messageLiset(String parameter, Integer communityId, Integer userID);
+    ResponseBean messageLiset(String parameter, Integer orgId, Integer userID);
 
     /**
      * 查询关于我的所有消息
      * @param parameter
-     * @param communityId
+     * @param orgId
      * @param id
      * @return
      */
-    ResponseBean myMessageList(String parameter, Integer communityId, Integer id);
+    ResponseBean myMessageList(String parameter, Integer orgId, Integer id);
 
     /**
      * 批量删除（已读）

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

@@ -16,12 +16,12 @@ public interface ITpShopTypeService extends IService<TpShopType> {
 	
 	/**
 	 * 获取和商铺类型相关的所有数据
-	 * @param communityId
+	 * @param orgId
 	 * @param pageNum
 	 * @param pageSize
 	 * @return
 	 */
-	ResponseBean getTypesList(Integer communityId, Integer pageNum, Integer pageSize);
+	ResponseBean getTypesList(Integer orgId, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 删除商铺类型

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

@@ -16,7 +16,7 @@ import com.huiju.estateagents.property.model.TpTransaction;
  */
 public interface ITransactionService extends IService<TpTransaction> {
 	
-	ResponseBean getTransactionList(String parameter, Integer communityId);
+	ResponseBean getTransactionList(String parameter, Integer orgId);
 
 	/**
 	 * 获取交易信息详情
@@ -43,20 +43,20 @@ public interface ITransactionService extends IService<TpTransaction> {
 	/**
 	 * 修改二手交易
 	 * @param paramets
-	 * @param communityId
+	 * @param orgId
 	 * @param id
 	 * @return
 	 */
-    ResponseBean transactionsUpdata(String paramets, Integer communityId, Integer id);
+    ResponseBean transactionsUpdata(String paramets, Integer orgId, Integer id);
 
 	/**
 	 * 删除二手帖子
 	 * @param paramets
-	 * @param communityId
+	 * @param orgId
 	 * @param id
 	 * @return
 	 */
-	ResponseBean transactionsDelete(String paramets, Integer communityId, Integer id);
+	ResponseBean transactionsDelete(String paramets, Integer orgId, Integer id);
 
 	/**
 	 * 二手帖子评论列表

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

@@ -19,11 +19,11 @@ public interface IUserService extends IService<User> {
     /**
      * 登陆
      * @param phone
-     * @param communityId
+     * @param orgId
      * @param code
      * @return
      */
-    ResponseBean login(String phone, Integer communityId, String code);
+    ResponseBean login(String phone, Integer orgId, String code);
 
     /**
      * 根据 手机号 验证码 获取 该用户的所管理的小区
@@ -45,7 +45,7 @@ public interface IUserService extends IService<User> {
      * @param parameter
      * @return
      */
-    ResponseBean userList(String parameter, Integer communityId);
+    ResponseBean userList(String parameter, Integer orgId);
 
     /**
      * 添加成员角色
@@ -53,7 +53,7 @@ public interface IUserService extends IService<User> {
      * @param UserID
      * @return
      */
-    ResponseBean addUser(String parameter, Integer UserID, Integer communityId);
+    ResponseBean addUser(String parameter, Integer UserID, Integer orgId);
 
     /**
      * 修改成员
@@ -61,7 +61,7 @@ public interface IUserService extends IService<User> {
      * @param id
      * @return
      */
-    ResponseBean upDate(String parameter, Integer id, Integer communityId);
+    ResponseBean upDate(String parameter, Integer id, Integer orgId);
 
     /**
      * 查看成员详情
@@ -80,19 +80,19 @@ public interface IUserService extends IService<User> {
 
     /**
      * 获取所有角色
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean allUserRole(Integer communityId);
+    ResponseBean allUserRole(Integer orgId);
 
     /**
      * 大苏 token生成
      * @param appid
      * @param datetime 时间戳
      * @param encrypt 加密方式(默认MD5)
-     * @param communityId 小区
+     * @param orgId 小区
      * @param sign 传过来的签名
      * @return
      */
-    ResponseBean daSuToken(String appid, String datetime, String encrypt, String communityId, String sign);
+    ResponseBean daSuToken(String appid, String datetime, String encrypt, String orgId, String sign);
 }

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

@@ -21,10 +21,10 @@ public interface TpAnnouncementService extends IService<TpAnnouncement> {
     /**
      * 添加公告
      * @param paramets
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean addAnnouncement(String paramets, Integer communityId, Integer userId);
+    ResponseBean addAnnouncement(String paramets, Integer orgId, Integer userId);
 
     /**
      * 查询公告详情
@@ -38,14 +38,14 @@ public interface TpAnnouncementService extends IService<TpAnnouncement> {
       * @param paramets
      * @return
      */
-    ResponseBean updateAnnouncement(String paramets, Integer communityId, Integer userId);
+    ResponseBean updateAnnouncement(String paramets, Integer orgId, Integer userId);
 
     /**
      * 批量删除公告
       * @param paramets
-     * @param communityId
+     * @param orgId
      * @param id
      * @return
      */
-    ResponseBean deleteAnnouncement(String paramets, Integer communityId, Integer id);
+    ResponseBean deleteAnnouncement(String paramets, Integer orgId, Integer id);
 }

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

@@ -17,36 +17,36 @@ public interface TpTicketService extends IService<TpTicket> {
     /**
      * 工单列表
      * @param parameter
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean ticketLiset(String parameter, Integer communityId);
+    ResponseBean ticketLiset(String parameter, Integer orgId);
 
     /**
      * 工单详情
      * @param parameter
      * @return
      */
-    ResponseBean ticketDetails(String parameter, Integer userID, Integer communityId);
+    ResponseBean ticketDetails(String parameter, Integer userID, Integer orgId);
 
     /**
      * 添加工单回复
      * @param parameter
      * @param id
-     * @param communityId
+     * @param orgId
      * @param userName
      * @return
      */
-    ResponseBean addRecordComment(String parameter, Integer id, Integer communityId, String userName);
+    ResponseBean addRecordComment(String parameter, Integer id, Integer orgId, String userName);
 
     /**
      * 添加工单分配受理
      * @param parameter
      * @param id
-     * @param communityId
+     * @param orgId
      * @return
      */
-    ResponseBean addRecord(String parameter, Integer id, Integer communityId);
+    ResponseBean addRecord(String parameter, Integer id, Integer orgId);
 
     /**
      * 修改工单状态为拒绝处理
@@ -54,15 +54,15 @@ public interface TpTicketService extends IService<TpTicket> {
      * @param id
      * @return
      */
-    ResponseBean updateTicketStatus(String parameter, Integer id, Integer communityId, String userNmae, String LoginName);
+    ResponseBean updateTicketStatus(String parameter, Integer id, Integer orgId, String userNmae, String LoginName);
 
     /**
      * 修改当前状态为待评价
      * @param parameter
      * @param id
-     * @param communityId
+     * @param orgId
      * @param userName
      * @return
      */
-    ResponseBean updateTicket(String parameter, Integer id, Integer communityId, String userName, String longName);
+    ResponseBean updateTicket(String parameter, Integer id, Integer orgId, String userName, String longName);
 }

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

@@ -102,7 +102,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         map.put("ownerName", ownerName);
         map.put("billStatus", billStatus);
         map.put("payName", payName);
-        map.put("communityId", userElement.getOrgId());
+        map.put("orgId", userElement.getOrgId());
 
 
         Page<BillInvoice> page = new Page<>();
@@ -182,7 +182,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 插入流水
                 BillStatement billStatement = new BillStatement();
-                billStatement.setCommunityId(userElement.getOrgId());
+                billStatement.setOrgId(userElement.getOrgId());
                 billStatement.setBillInvoiceId(billInvoice.getId());
                 billStatement.setTaUserId(billInvoice.getTaUserId());
                 billStatement.setPayPrice(billInvoice.getPayPrice());
@@ -212,7 +212,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 生成订单
                 TpBillOrder tpBillOrder = new TpBillOrder();
-                tpBillOrder.setCommunityId(userElement.getOrgId());
+                tpBillOrder.setOrgId(userElement.getOrgId());
                 tpBillOrder.setTpBillId(billInvoice.getBillId());
                 tpBillOrder.setTpBillInvoiceId(billInvoice.getId());
 
@@ -232,7 +232,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 把相对应的 APP端用户的代办消息进行设置为无效
                 QueryWrapper<Message> messageQueryWrapper = new QueryWrapper<>();
-                messageQueryWrapper.eq("community_id", userElement.getOrgId());
+                messageQueryWrapper.eq("org_id", userElement.getOrgId());
                 messageQueryWrapper.eq("bill_id", billInvoice.getId());
                 messageQueryWrapper.eq("uuid_type", "1");
                 messageQueryWrapper.eq("uuid", billInvoice.getTaUserId());
@@ -289,7 +289,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
         // 校验 期/区/栋/单元/楼层/户号
         QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
-        roomNoQueryWrapper.eq("community_id", userElement.getOrgId());
+        roomNoQueryWrapper.eq("org_id", userElement.getOrgId());
         roomNoQueryWrapper.eq("phase_id", phase);
         roomNoQueryWrapper.eq("building_id", building);
         roomNoQueryWrapper.eq("unit_id", unit);
@@ -310,7 +310,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
         // 设置房号
         billInvoice.setBillId(billId);
-        billInvoice.setCommunityId(userElement.getOrgId());
+        billInvoice.setOrgId(userElement.getOrgId());
         billInvoice.setBillInvoiceExplain(billInvoiceExplain);
 //        billInvoice.setPayPrice(PayPriceUtils.yuanConversionPoints(payPrice));
         billInvoice.setBillStatus("0");
@@ -356,7 +356,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
             // 往APP端用户上面的每一个用户推送
             Message messageModelAPP = new Message();
-            messageModelAPP.setCommunityId(userElement.getOrgId());
+            messageModelAPP.setOrgId(userElement.getOrgId());
             messageModelAPP.setMessageType("7");
             messageModelAPP.setAdviceType("1");
             messageModelAPP.setModelType("2");
@@ -384,7 +384,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> map = Maps.newHashMap();
         map.put("billId", billId);
-        map.put("communityId", userElement.getOrgId());
+        map.put("orgId", userElement.getOrgId());
 
         List<BillInvoice> billInvoices = billInvoiceMapper.selectBillInvoiceTemp(map);
 
@@ -480,7 +480,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("billId", billId);
-        map.put("communityId", userElement.getOrgId());
+        map.put("orgId", userElement.getOrgId());
 
         Page<BillInvoice> page = new Page<>();
         page.setCurrent(1);
@@ -580,7 +580,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
         QueryWrapper<BillInvoice> billInvoiceQueryWrapper = new QueryWrapper<>();
         billInvoiceQueryWrapper.eq("bill_id", billId);
-        billInvoiceQueryWrapper.eq("community_id", userElement.getOrgId());
+        billInvoiceQueryWrapper.eq("org_id", userElement.getOrgId());
 
         IPage<BillInvoice> billInvoiceIPage = billInvoiceMapper.selectPage(page, billInvoiceQueryWrapper);
         List<BillInvoice> records = billInvoiceIPage.getRecords();

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

@@ -203,7 +203,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             // 查询出这个收费单, 存在的缴费单数据
             QueryWrapper<BillInvoice> billInvoiceQueryWrapper = new QueryWrapper<>();
             billInvoiceQueryWrapper.eq("bill_id", billId);
-            billInvoiceQueryWrapper.eq("community_id", userElement.getOrgId());
+            billInvoiceQueryWrapper.eq("org_id", userElement.getOrgId());
             records = billInvoiceMapper.selectList(billInvoiceQueryWrapper);
         }
 
@@ -246,7 +246,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             bill.setCreateDate(new Date());
             bill.setCreateUser(userElement.getUserId());
         }
-        bill.setCommunityId(userElement.getOrgId());
+        bill.setOrgId(userElement.getOrgId());
         Integer payTotalNum = tempBills.size() != 0 ? tempBills.size() : records != null ? records.size() : 0;
         Integer unpayedNum = tempBills.size() != 0 ? tempBills.size() : records != null ? records.size() : 0;
         bill.setPayTotalNum(payTotalNum);
@@ -274,7 +274,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         boolean b = this.saveOrUpdate(bill);
         if (b) {
             QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("community_id", userElement.getOrgId());
+            queryWrapper.eq("org_id", userElement.getOrgId());
             queryWrapper.eq("message_type", "7");
             queryWrapper.eq("model_type", "2");
             queryWrapper.eq("source", "2");
@@ -285,7 +285,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             // 草稿时插入消息
             if ("2".equals(bill.getBillStatus()) && null == message) {
                 message = new Message();
-                message.setCommunityId(userElement.getOrgId());
+                message.setOrgId(userElement.getOrgId());
                 message.setMessageType("7");
                 message.setAdviceType("4");
                 message.setModelType("2");
@@ -313,7 +313,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
                 // 插入消息表, 消息类型为 消息
                 Message messageModel = new Message();
-                messageModel.setCommunityId(userElement.getOrgId());
+                messageModel.setOrgId(userElement.getOrgId());
                 messageModel.setMessageType("7");
                 messageModel.setAdviceType("4");
                 messageModel.setModelType("1");
@@ -334,7 +334,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             }
             List<BillInvoice> billInvoices = tempBills.stream().map(e -> {
                 BillInvoice billInvoice = new BillInvoice();
-                billInvoice.setCommunityId(userElement.getOrgId());
+                billInvoice.setOrgId(userElement.getOrgId());
                 billInvoice.setBillId(bill.getId());
 
                 /**
@@ -364,7 +364,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
                         // 往APP端用户上面的每一个用户推送
                         Message messageModelAPP = new Message();
-                        messageModelAPP.setCommunityId(userElement.getOrgId());
+                        messageModelAPP.setOrgId(userElement.getOrgId());
                         messageModelAPP.setMessageType("7");
                         messageModelAPP.setAdviceType("1");
                         messageModelAPP.setModelType("2");
@@ -390,7 +390,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         return responseBean;
     }
 
-    private ResponseBean getExcelData(MultipartFile file, ResponseBean responseBean, Integer communityId) {
+    private ResponseBean getExcelData(MultipartFile file, ResponseBean responseBean, Integer orgId) {
 
         // 数据
         List<TempBill> tempBills = Lists.newArrayList();
@@ -430,7 +430,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             // 获取编号
             String roomId = cell.getStringCellValue().trim();
             QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
-            roomNoQueryWrapper.eq("community_id", communityId);
+            roomNoQueryWrapper.eq("org_id", orgId);
             roomNoQueryWrapper.eq("id", roomId);
             TpRoomNo tpRoomNo = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
             if (null == tpRoomNo) {
@@ -543,7 +543,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
             // 发布时消息为无效
             QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("community_id", userElement.getOrgId());
+            queryWrapper.eq("org_id", userElement.getOrgId());
             queryWrapper.eq("message_type", "7");
             queryWrapper.eq("model_type", "2");
             queryWrapper.eq("source", "2");

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

@@ -70,7 +70,7 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
         map.put("billName", billName);
         map.put("billInvoiceId", billInvoiceId);
         map.put("payPhone", payPhone);
-        map.put("communityId", userElement.getOrgId());
+        map.put("orgId", userElement.getOrgId());
 
         Page<TpBillOrder> page = new Page<>();
         page.setCurrent(pageNum);
@@ -160,7 +160,7 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
         }
 
         Map<String, Object> map = Maps.newHashMap();
-        map.put("communityId", userElement.getOrgId());
+        map.put("orgId", userElement.getOrgId());
 
         Page<BillStatement> page = new Page<>();
         page.setCurrent(1);

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

@@ -111,7 +111,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         TpBuildingOwnerInfo tpBuildingOwnerInfo = jsonObject.toJavaObject(jsonObject,TpBuildingOwnerInfo.class);
-        tpBuildingOwnerInfo.setCommunityId(userElement.getOrgId());
+        tpBuildingOwnerInfo.setOrgId(userElement.getOrgId());
         Long pageNum = jsonObject.getLong("pageNum") == null ? 1 : jsonObject.getLong("pageNum");
         Long pageSize = jsonObject.getLong("pageSize") == null ? 10 : jsonObject.getLong("pageSize");
 
@@ -157,7 +157,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 判断当前是否存在审核通过的业主
         // 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
-        TaUserVerify ownerUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userVerify.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId());
+        TaUserVerify ownerUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userVerify.getOrgId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId());
         if (null != ownerUserVerify && roleId.intValue() == 1) {
             responseBean.addSuccess("已存在业主！");
             return responseBean;
@@ -276,7 +276,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         // 审核表中插入一条数据, 审核已通过，并且是业主角色
         TaUserVerify taUserVerify = new TaUserVerify();
 //        taUserVerify.setUserId(appUser.getId());
-        taUserVerify.setCommunityId(userElement.getOrgId());
+        taUserVerify.setOrgId(userElement.getOrgId());
         taUserVerify.setRoleId(roleId);
         taUserVerify.setPhaseId(tpBuildingOwnerInfo.getPhaseId());
         taUserVerify.setPhaseName(tpBuildingOwnerInfo.getPhaseName());
@@ -300,7 +300,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         String[] messageArr= new messagePush().messagePushAll( );
         for (String count : messageArr) {
             Message message = new Message();
-            message.setCommunityId(taUserVerify.getCommunityId());
+            message.setOrgId(taUserVerify.getOrgId());
             message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
@@ -339,14 +339,14 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * @param unitId
      * @param levelId
      * @param roomNoId
-     * @param communityId
+     * @param orgId
      * @param userId 创建人
      * @param gender
      * @param ownerName
      * @param ownerTel
      */
     private TpBuildingOwnerInfo insertTpBuildingOwnerInfo (Integer phaseId, Integer buildingId, Integer unitId,
-                                                           Integer levelId, Integer roomNoId, Integer communityId,
+                                                           Integer levelId, Integer roomNoId, Integer orgId,
                                                            Integer userId, String gender, String ownerName, String ownerTel) {
         TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
 
@@ -380,7 +380,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         tpBuildingOwnerInfo.setPairStatus("0");
 
         // 添加的时候, 默认是当前操作的小区
-        tpBuildingOwnerInfo.setCommunityId(communityId);
+        tpBuildingOwnerInfo.setOrgId(orgId);
 
         int row = tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
         if (row <= 0) {
@@ -392,32 +392,32 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     /**
      * 修改 APP 端用户的角色
-     * @param communityId 小区Id
+     * @param orgId 小区Id
      * @param appUserId APP 端用户Id
      * @param roleId 角色Id
      */
-    private void updateAppRole(Integer communityId, Integer appUserId, Integer roleId) {
+    private void updateAppRole(Integer orgId, Integer appUserId, Integer roleId) {
         // 更新APP端用户的角色身份
-        taSysUserRoleMapper.deleteByCommunityIdAndUserId(communityId, appUserId);
+        taSysUserRoleMapper.deleteByCommunityIdAndUserId(orgId, appUserId);
         TaSysUserRole taSysUserRole = new TaSysUserRole();
         taSysUserRole.setUserId(appUserId);
         taSysUserRole.setRoleId(Constant.OWNER_ID);
-        taSysUserRole.setCommunityId(communityId);
+        taSysUserRole.setOrgId(orgId);
         taSysUserRoleMapper.insert(taSysUserRole);
     }
 
 
     @Override
-    public ResponseBean getPhaseList(Integer communityId) {
+    public ResponseBean getPhaseList(Integer orgId) {
 
         ResponseBean responseBean = new ResponseBean();
-        if (null == communityId || "".equals(communityId)) {
-            throw new WisdomException("编号:%s 小区不存在!", communityId);
+        if (null == orgId || "".equals(orgId)) {
+            throw new WisdomException("编号:%s 小区不存在!", orgId);
         }
 
         Map<String, Object> map = Maps.newHashMap();
         // 小区
-        map.put("community_id", communityId);
+        map.put("org_id", orgId);
         QueryWrapper<TpPhase> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map, false);
     
@@ -469,7 +469,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         //有用户的情况下查看是否有申请的房产
         QueryWrapper<TaUserVerify> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("community_id",userElement.getOrgId());
+        queryWrapper.eq("org_id",userElement.getOrgId());
         queryWrapper.eq("user_id",taUser.getUserId());
         List<TaUserVerify> verifyList = taUserVerifyMapper.selectList(queryWrapper);
         AtomicInteger rows = new AtomicInteger();
@@ -518,7 +518,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     private void saveVerifyData(Integer userId, TpBuildingOwnerInfo tpBuildingOwnerInfo, TaUser userElement) {
         TaUserVerify taUserVerify = new TaUserVerify();
         taUserVerify.setUserId(userId);
-        taUserVerify.setCommunityId(userElement.getOrgId());
+        taUserVerify.setOrgId(userElement.getOrgId());
         if (tpBuildingOwnerInfo.getRoleName().equals("户主")){
             taUserVerify.setRoleId(1);
         }else if (tpBuildingOwnerInfo.getRoleName().equals("家属")){
@@ -566,7 +566,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
 
         // 通过后，需要往楼栋资料库写入数据
-        tpBuildingOwnerInfo.setCommunityId(userElement.getOrgId());
+        tpBuildingOwnerInfo.setOrgId(userElement.getOrgId());
 //        tpBuildingOwnerInfo.setIdCard(taUser.getIdCard());
 //        tpBuildingOwnerInfo.setGender(taUser.getGender());
         tpBuildingOwnerInfo.setPairStatus("1");
@@ -811,7 +811,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 //            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
 //            if (null != tpBuildingOwnerInfo) {
 //                // 查询 APP 端业主
-//                TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getCommunityId());
+//                TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getOrgId());
 //                if (null != appOwnerUser) {
 //                    appOwnerUser.setVerifyStatus(2+"");
 //                    appOwnerUser.setUpdateDate(LocalDateTime.now());
@@ -891,12 +891,12 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public ResponseBean puildinghouse(String parameter, Integer communityId) {
+    public ResponseBean puildinghouse(String parameter, Integer orgId) {
         return null;
     }
 
     @Override
-    public ResponseBean communitybuildingUpdate(String parameter, Integer communityId) {
+    public ResponseBean communitybuildingUpdate(String parameter, Integer orgId) {
         return null;
         };
 
@@ -920,14 +920,14 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * 查询 楼栋信息
      *      根据小区Id, 栋,单元,楼层,房号
      * @param tpBuildingOwnerInfo 楼栋信息
-     * @param communityId 小区Id
+     * @param orgId 小区Id
      * @return
      */
-    private TpBuildingOwnerInfo getBuildingInfo(TpBuildingOwnerInfo tpBuildingOwnerInfo, Integer communityId) {
+    private TpBuildingOwnerInfo getBuildingInfo(TpBuildingOwnerInfo tpBuildingOwnerInfo, Integer orgId) {
         // 校验楼栋信息表
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         // 小区ID
-        queryWrapper.eq("community_id", communityId);
+        queryWrapper.eq("org_id", orgId);
         // 期
         queryWrapper.eq("phase_id", tpBuildingOwnerInfo.getPhaseId());
         // 栋
@@ -1036,18 +1036,18 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * 获取楼栋信息
      *
      * @param phaseId
-     * @param communityId
+     * @param orgId
      * @return
      */
     @Override
-    public ResponseBean getBuildingList(Integer phaseId, Integer communityId) {
+    public ResponseBean getBuildingList(Integer phaseId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
-        if (null == communityId || "".equals(communityId)) {
-            throw new WisdomException("编号:%s 小区不存在!", communityId);
+        if (null == orgId || "".equals(orgId)) {
+            throw new WisdomException("编号:%s 小区不存在!", orgId);
         }
     
         QueryWrapper<TpBuilding> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("community_id", communityId);
+        queryWrapper.eq("org_id", orgId);
         queryWrapper.eq("phase_id", phaseId);
     
         List<TpBuilding> tpBuildingList = tpBuildingMapper.selectList(queryWrapper);
@@ -1060,18 +1060,18 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * 获取单元信息
      *
      * @param buildingId
-     * @param communityId
+     * @param orgId
      * @return
      */
     @Override
-    public ResponseBean getUnitList(Integer buildingId, Integer communityId) {
+    public ResponseBean getUnitList(Integer buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
-        if (null == communityId || "".equals(communityId)) {
-            throw new WisdomException("编号:%s 小区不存在!", communityId);
+        if (null == orgId || "".equals(orgId)) {
+            throw new WisdomException("编号:%s 小区不存在!", orgId);
         }
     
         QueryWrapper<TpUnit> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("community_id", communityId);
+        queryWrapper.eq("org_id", orgId);
         queryWrapper.eq("building_id", buildingId);
     
         List<TpUnit> tpUnitList = tpUnitMapper.selectList(queryWrapper);
@@ -1084,18 +1084,18 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * 获取楼层信息
      *
      * @param unitId
-     * @param communityId
+     * @param orgId
      * @return
      */
     @Override
-    public ResponseBean getLevelList(Integer unitId, Integer communityId) {
+    public ResponseBean getLevelList(Integer unitId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
-        if (null == communityId || "".equals(communityId)) {
-            throw new WisdomException("编号:%s 小区不存在!", communityId);
+        if (null == orgId || "".equals(orgId)) {
+            throw new WisdomException("编号:%s 小区不存在!", orgId);
         }
     
         QueryWrapper<TpLevel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("community_id", communityId);
+        queryWrapper.eq("org_id", orgId);
         queryWrapper.eq("unit_id", unitId);
     
         List<TpLevel> tpLevelList = tpLevelMapper.selectList(queryWrapper);
@@ -1108,18 +1108,18 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * 获取室号信息
      *
      * @param levelId
-     * @param communityId
+     * @param orgId
      * @return
      */
     @Override
-    public ResponseBean getRoomNoList(Integer levelId, Integer communityId) {
+    public ResponseBean getRoomNoList(Integer levelId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
-        if (null == communityId || "".equals(communityId)) {
-            throw new WisdomException("编号:%s 小区不存在!", communityId);
+        if (null == orgId || "".equals(orgId)) {
+            throw new WisdomException("编号:%s 小区不存在!", orgId);
         }
     
         QueryWrapper<TpRoomNo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("community_id", communityId);
+        queryWrapper.eq("org_id", orgId);
         queryWrapper.eq("level_id", levelId);
     
         List<TpRoomNo> tpLevelList = tpRoomNoMapper.selectList(queryWrapper);
@@ -1143,7 +1143,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         //查询人脸
         QueryWrapper<TaFace> taFace= new QueryWrapper<>();
-        taFace.eq("community_id",taUserVerify.getCommunityId());
+        taFace.eq("org_id",taUserVerify.getOrgId());
         taFace.eq("ta_user_verify_id",id);
         TaFace face= taFaceMapper.selectOne(taFace);
         if(null!=face) {

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

@@ -174,10 +174,10 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
 		
 		//入库
-		Integer communityId = userElement.getOrgId();
+		Integer orgId = userElement.getOrgId();
 		
 		//保存数据到表中--拆分数据
-		saveBuildingTreeData(communityId,list);
+		saveBuildingTreeData(orgId,list);
 		responseBean.addSuccess("success");
 		return responseBean;
 	}
@@ -185,19 +185,19 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	/**
 	 * 获取树形数据
 	 *
-	 * @param communityId
+	 * @param orgId
 	 * @param id
 	 * @param treeType
 	 * @return
 	 */
 	@Override
-	public ResponseBean getTreeList(Integer communityId, Integer id, String treeType) {
+	public ResponseBean getTreeList(Integer orgId, Integer id, String treeType) {
 		ResponseBean responseBean = new ResponseBean();
 		List<Map<String,Object>> resultList = new ArrayList<>();
 		//获取区/期树形数据
 		if (treeType.equals("phase")){
 			QueryWrapper<TpPhase> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("community_id",communityId);
+			queryWrapper.eq("org_id",orgId);
 			queryWrapper.orderByAsc("create_date");
 			List<TpPhase> list = tpPhaseMapper.selectList(queryWrapper);
 			list.stream().forEach(e -> {
@@ -209,7 +209,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			});
 		}else if (treeType.equals("building")){
 			QueryWrapper<TpBuilding> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("community_id",communityId);
+			queryWrapper.eq("org_id",orgId);
 			queryWrapper.eq("phase_id",id);
 			queryWrapper.orderByAsc("create_date");
 			List<TpBuilding> list = tpBuildingMapper.selectList(queryWrapper);
@@ -222,7 +222,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			});
 		}else if (treeType.equals("unit")){
 			QueryWrapper<TpUnit> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("community_id",communityId);
+			queryWrapper.eq("org_id",orgId);
 			queryWrapper.eq("building_id",id);
 			queryWrapper.orderByAsc("create_date");
 			List<TpUnit> list = tpUnitMapper.selectList(queryWrapper);
@@ -235,7 +235,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			});
 		}else if (treeType.equals("level")){
 			QueryWrapper<TpLevel> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("community_id",communityId);
+			queryWrapper.eq("org_id",orgId);
 			queryWrapper.eq("unit_id",id);
 			queryWrapper.orderByAsc("create_date");
 			List<TpLevel> list = tpLevelMapper.selectList(queryWrapper);
@@ -248,7 +248,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			});
 		}else if (treeType.equals("roomNo")){
 			QueryWrapper<TpRoomNo> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("community_id",communityId);
+			queryWrapper.eq("org_id",orgId);
 			queryWrapper.eq("level_id",id);
 			queryWrapper.orderByAsc("create_date");
 			List<TpRoomNo> list = tpRoomNoMapper.selectList(queryWrapper);
@@ -266,7 +266,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	}
 
 	@Override
-	public ResponseBean addNode(String parameter, Integer communityId) {
+	public ResponseBean addNode(String parameter, Integer orgId) {
 		ResponseBean responseBean= new ResponseBean();
 		 JSONObject object= JSONObject.parseObject(parameter);
 		 //当前节点id
@@ -280,7 +280,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		if(type.equals("phase")) {
 			//是否存在同样的名字
 			QueryWrapper<TpPhase> tpPhaseQuery = new QueryWrapper<>();
-			tpPhaseQuery.eq("community_id",communityId);
+			tpPhaseQuery.eq("org_id",orgId);
 			tpPhaseQuery.eq("NAME",nodeNumber);
 			TpPhase phase= tpPhaseMapper.selectOne(tpPhaseQuery);
 			if (null!=phase){
@@ -288,7 +288,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				return responseBean;
 			}
 			TpPhase tpPhase= new TpPhase();
-					tpPhase.setCommunityId(communityId);
+					tpPhase.setOrgId(orgId);
 					tpPhase.setName(nodeNumber);
 					tpPhase.setCreateDate(LocalDateTime.now());
 					tpPhaseMapper.insert(tpPhase);
@@ -297,7 +297,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		if(type.equals("building")){
 			//是否存在同样的名字
 			QueryWrapper<TpBuilding> tpBuildingQuery = new QueryWrapper<>();
-			tpBuildingQuery.eq("community_id",communityId);
+			tpBuildingQuery.eq("org_id",orgId);
 			tpBuildingQuery.eq("phase_id",tpPhase.getId());
 			tpBuildingQuery.eq("phase_name",tpPhase.getName());
 			tpBuildingQuery.eq("name",nodeNumber);
@@ -307,7 +307,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				return responseBean;
 			}
 		 TpBuilding tpBuilding= new TpBuilding();
-					tpBuilding.setCommunityId(tpPhase.getCommunityId())
+					tpBuilding.setOrgId(tpPhase.getOrgId())
 						 .setPhaseId(tpPhase.getId())
 						 .setPhaseName(tpPhase.getName())
 						 .setName(nodeNumber)
@@ -319,7 +319,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		if (type.equals("unit")){
 			// 校验节点名称
 			QueryWrapper<TpUnit> unitQuery=new QueryWrapper<>();
-			unitQuery.eq("community_id",selectTpBuilding.getCommunityId());
+			unitQuery.eq("org_id",selectTpBuilding.getOrgId());
 			unitQuery.eq("phase_id",selectTpBuilding.getPhaseId());
 			unitQuery.eq("building_id",selectTpBuilding.getId());
 			unitQuery.eq("name",nodeNumber);
@@ -329,7 +329,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				return responseBean;
 			}
 		 TpUnit tpUnit= new TpUnit();
-				tpUnit.setCommunityId(selectTpBuilding.getCommunityId())
+				tpUnit.setOrgId(selectTpBuilding.getOrgId())
 						.setPhaseId(selectTpBuilding.getPhaseId())
 						.setPhaseName(selectTpBuilding.getPhaseName())
 						.setBuildingName(selectTpBuilding.getName())
@@ -344,7 +344,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		if(type.equals("level")){
 			//校验楼层名称
 			QueryWrapper<TpLevel> levelQuery=new QueryWrapper<>();
-			levelQuery.eq("community_id",selectTpUnit.getCommunityId());
+			levelQuery.eq("org_id",selectTpUnit.getOrgId());
 			levelQuery.eq("phase_id",selectTpUnit.getPhaseId());
 			levelQuery.eq("building_id",selectTpUnit.getBuildingId());
 			levelQuery.eq("unit_id",selectTpUnit.getId());
@@ -356,7 +356,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			}
 		 TpLevel tpLevel= new TpLevel();
 		tpLevel.setId(selectTpUnit.getId())
-				.setCommunityId(selectTpUnit.getCommunityId())
+				.setOrgId(selectTpUnit.getOrgId())
 				.setPhaseId(selectTpUnit.getPhaseId())
 				.setPhaseName(selectTpUnit.getPhaseName())
 				.setBuildingId(selectTpUnit.getBuildingId())
@@ -371,7 +371,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	 	TpLevel selectTpLevel= tpLevelMapper.selectById(id);
 		if(type.equals("roomNo")){
 			 QueryWrapper<TpRoomNo> tpRoomNoQuery= new QueryWrapper<>();
-			tpRoomNoQuery.eq("community_id",selectTpLevel.getCommunityId());
+			tpRoomNoQuery.eq("org_id",selectTpLevel.getOrgId());
 			tpRoomNoQuery.eq("phase_id",selectTpLevel.getPhaseId());
 			tpRoomNoQuery.eq("building_id",selectTpLevel.getBuildingId());
 			tpRoomNoQuery.eq("unit_id",selectTpLevel.getUnitId());
@@ -382,7 +382,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				return  responseBean;
 			}
 			TpRoomNo tpRoomNo= new TpRoomNo();
-			tpRoomNo.setCommunityId(selectTpLevel.getCommunityId())
+			tpRoomNo.setOrgId(selectTpLevel.getOrgId())
 							.setPhaseId(selectTpLevel.getPhaseId())
 							.setPhaseName(selectTpLevel.getPhaseName())
 							.setBuildingId(selectTpLevel.getBuildingId())
@@ -400,7 +400,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	}
 
 	@Override
-	public ResponseBean deleteNode(String parameter, Integer communityId) {
+	public ResponseBean deleteNode(String parameter, Integer orgId) {
 		ResponseBean responseBean= new ResponseBean();
 		//注意刪除当前节点，根据type判断当前节点的位置，删除时先删除当前节点的最小节点。
 		JSONObject object= JSONObject.parseObject(parameter);
@@ -424,7 +424,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		if(type.equals("roomNo")){
 			TpLevel tpLevel= tpLevelMapper.selectById(id);
 			QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
-			Info.eq("community_id", tpLevel.getCommunityId());
+			Info.eq("org_id", tpLevel.getOrgId());
 			Info.eq("phase_id", tpLevel.getPhaseId());
 			Info.eq("building_id",tpLevel.getBuildingId());
 			Info.eq("unit_id", tpLevel.getUnitId());
@@ -439,7 +439,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			//删除单元下的楼层
 			QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
 			tpLevel.eq("phase_id", tpUnit.getPhaseId());
-			tpLevel.eq("community_id", tpUnit.getCommunityId());
+			tpLevel.eq("org_id", tpUnit.getOrgId());
 			tpLevel.eq("building_id", tpUnit.getBuildingId());
 			tpLevel.eq("unit_id", tpUnit.getId());
 			//删除单元-楼层-下的房间
@@ -448,7 +448,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			List<TpLevel> levelevelList = tpLevelMapper.selectList(tpLevel);
 			for (TpLevel levelevel:levelevelList) {
 				QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
-				Info.eq("community_id", tpUnit.getCommunityId());
+				Info.eq("org_id", tpUnit.getOrgId());
 				Info.eq("phase_id", tpUnit.getPhaseId());
 				Info.eq("building_id", tpUnit.getBuildingId());
 				Info.eq("unit_id", tpUnit.getId());
@@ -468,7 +468,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			TpBuilding tpBuilding= tpBuildingMapper.selectById(id);
 			//删除单元-楼层-房间
 			QueryWrapper<TpUnit> tpUnit = new QueryWrapper<>();
-			tpUnit.eq("community_id", tpBuilding.getCommunityId());
+			tpUnit.eq("org_id", tpBuilding.getOrgId());
 			tpUnit.eq("phase_id", tpBuilding.getPhaseId());
 			tpUnit.eq("building_id", tpBuilding.getId());
 			tpUnit.eq("building_name", tpBuilding.getName());
@@ -478,7 +478,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			if (null!=unitList) {
 				for (TpUnit unit: unitList) {
 					tpLevel.eq("phase_id", unit.getPhaseId());
-					tpLevel.eq("community_id", unit.getCommunityId());
+					tpLevel.eq("org_id", unit.getOrgId());
 					tpLevel.eq("building_id", unit.getBuildingId());
 					tpLevel.eq("unit_id", unit.getId());
 					tpLevel.eq("unit_name", unit.getName());
@@ -488,7 +488,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 					if (null!=levelList) {
 						for (TpLevel level:levelList) {
 							tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
-							tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
+							tpRoomNoQueryWrapper.eq("org_id", level.getOrgId());
 							tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
 							tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
 							tpRoomNoQueryWrapper.eq("level_id", level.getId());
@@ -511,7 +511,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 
 			QueryWrapper<TpBuilding> building= new QueryWrapper<>();
 			building.eq("phase_id", phase.getId());
-			building.eq("community_id", phase.getCommunityId());
+			building.eq("org_id", phase.getOrgId());
 			building.eq("name", phase.getName());
 			List<TpBuilding> tpBuildingList= tpBuildingMapper.selectList(building);
 			for (TpBuilding tpBuilding:tpBuildingList){
@@ -519,7 +519,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			QueryWrapper<TpUnit> tpUnit = new QueryWrapper<>();
 			List<TpUnit> unitList=null;
 			if (null!=tpBuilding) {
-				tpUnit.eq("community_id", tpBuilding.getCommunityId());
+				tpUnit.eq("org_id", tpBuilding.getOrgId());
 				tpUnit.eq("phase_id", tpBuilding.getPhaseId());
 				tpUnit.eq("building_id", tpBuilding.getId());
 				tpUnit.eq("building_name", tpBuilding.getName());
@@ -530,7 +530,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			if (null!=unitList) {
 				for (TpUnit unit : unitList) {
 					tpLevel.eq("phase_id", unit.getPhaseId());
-					tpLevel.eq("community_id", unit.getCommunityId());
+					tpLevel.eq("org_id", unit.getOrgId());
 					tpLevel.eq("building_id", unit.getBuildingId());
 					tpLevel.eq("unit_id", unit.getId());
 					tpLevel.eq("unit_name", unit.getName());
@@ -540,7 +540,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 						for (TpLevel level : levelList) {
 							QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
 							tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
-							tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
+							tpRoomNoQueryWrapper.eq("org_id", level.getOrgId());
 							tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
 							tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
 							tpRoomNoQueryWrapper.eq("level_id", level.getId());
@@ -565,7 +565,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		return responseBean;
 	}
 
-	private void saveBuildingTreeData(Integer communityId, List<TpBuildingOwnerInfo> list) {
+	private void saveBuildingTreeData(Integer orgId, List<TpBuildingOwnerInfo> list) {
 		String lastPhaseName = "";
 		String lastBuildingName = "";
 		String lastUnitName = "";
@@ -581,11 +581,11 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			//插入期/区数据
 				TpPhase tpPhase = new TpPhase();
 				tpPhase.setName(tpBuildingOwnerInfo.getPhaseName());
-				tpPhase.setCommunityId(communityId);
+				tpPhase.setOrgId(orgId);
 				tpPhase.setCreateDate(LocalDateTime.now());
 
 				QueryWrapper<TpPhase> phaseQueryWrapper = new QueryWrapper<>();
-				phaseQueryWrapper.eq("community_id", communityId);
+				phaseQueryWrapper.eq("org_id", orgId);
 				phaseQueryWrapper.eq("`NAME`", tpBuildingOwnerInfo.getPhaseName());
 				TpPhase selectPhase = tpPhaseMapper.selectOne(phaseQueryWrapper);
 				// 判断是否存在库里
@@ -604,14 +604,14 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				}
 			//插入楼栋数据
 				TpBuilding tpBuilding = new TpBuilding();
-				tpBuilding.setCommunityId(communityId);
+				tpBuilding.setOrgId(orgId);
 				tpBuilding.setPhaseId(lastPhaseId);
 				tpBuilding.setPhaseName(lastPhaseName);
 				tpBuilding.setName(tpBuildingOwnerInfo.getBuildingName());
 				tpBuilding.setCreateDate(LocalDateTime.now());
 
 				QueryWrapper<TpBuilding> buildingQueryWrapper = new QueryWrapper<>();
-				buildingQueryWrapper.eq("community_id", communityId);
+				buildingQueryWrapper.eq("org_id", orgId);
 				buildingQueryWrapper.eq("phase_id", lastPhaseId);
 				buildingQueryWrapper.eq("`name`", tpBuildingOwnerInfo.getBuildingName());
 				TpBuilding selectBuilding = tpBuildingMapper.selectOne(buildingQueryWrapper);
@@ -626,7 +626,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 
 			//插入单元信息
 				TpUnit tpUnit = new TpUnit();
-				tpUnit.setCommunityId(communityId);
+				tpUnit.setOrgId(orgId);
 				tpUnit.setPhaseId(lastPhaseId);
 				tpUnit.setPhaseName(lastPhaseName);
 				tpUnit.setBuildingId(lastBuildingId);
@@ -635,7 +635,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpUnit.setCreateDate(LocalDateTime.now());
 
 				QueryWrapper<TpUnit> unitQueryWrapper = new QueryWrapper<>();
-				unitQueryWrapper.eq("community_id", communityId);
+				unitQueryWrapper.eq("org_id", orgId);
 				unitQueryWrapper.eq("phase_id", lastPhaseId);
 				unitQueryWrapper.eq("building_id", lastBuildingId);
 				unitQueryWrapper.eq("`name`",tpBuildingOwnerInfo.getUnitName());
@@ -653,7 +653,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			//插入楼层信息
 
 				TpLevel tpLevel = new TpLevel();
-				tpLevel.setCommunityId(communityId);
+				tpLevel.setOrgId(orgId);
 				tpLevel.setPhaseId(lastPhaseId);
 				tpLevel.setPhaseName(lastPhaseName);
 				tpLevel.setBuildingId(lastBuildingId);
@@ -664,7 +664,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpLevel.setCreateDate(LocalDateTime.now());
 
 				QueryWrapper<TpLevel> levelQueryWrapper = new QueryWrapper<>();
-				levelQueryWrapper.eq("community_id", communityId);
+				levelQueryWrapper.eq("org_id", orgId);
 				levelQueryWrapper.eq("phase_id", lastPhaseId);
 				levelQueryWrapper.eq("building_id", lastBuildingId);
 				levelQueryWrapper.eq("unit_id", lastUnitId);
@@ -682,7 +682,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 
 			//插入房间号信息
 				TpRoomNo tpRoomNo = new TpRoomNo();
-				tpRoomNo.setCommunityId(communityId);
+				tpRoomNo.setOrgId(orgId);
 				tpRoomNo.setPhaseId(lastPhaseId);
 				tpRoomNo.setPhaseName(lastPhaseName);
 				tpRoomNo.setBuildingId(lastBuildingId);
@@ -695,7 +695,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpRoomNo.setCreateDate(LocalDateTime.now());
 
 				QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
-				roomNoQueryWrapper.eq("community_id", communityId);
+				roomNoQueryWrapper.eq("org_id", orgId);
 				roomNoQueryWrapper.eq("phase_id", lastPhaseId);
 				roomNoQueryWrapper.eq("building_id", lastBuildingId);
 				roomNoQueryWrapper.eq("unit_id", lastUnitId);
@@ -715,7 +715,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			//判断书否有已审核人员
 			TpRoomNo info = tpRoomNoMapper.selectById(id);
 			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
-			taUserVerify.eq("community_id", info.getCommunityId())
+			taUserVerify.eq("org_id", info.getOrgId())
 					.eq("phase_id", info.getPhaseId())
 					.eq("building_id", info.getBuildingId())
 					.eq("unit_id", info.getUnitId())
@@ -731,7 +731,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			TpLevel tpLevel = tpLevelMapper.selectById(id);
 			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
 			if (null!=tpLevel) {
-				tpBuildingOwnerInfo.eq("community_id", tpLevel.getCommunityId())
+				tpBuildingOwnerInfo.eq("org_id", tpLevel.getOrgId())
 						.eq("phase_id", tpLevel.getPhaseId())
 						.eq("building_id", tpLevel.getBuildingId())
 						.eq("unit_id", tpLevel.getUnitId())
@@ -747,7 +747,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			TpUnit tpUnit = tpUnitMapper.selectById(id);
 			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
 			if (null!=tpUnit) {
-				tpBuildingOwnerInfo.eq("community_id", tpUnit.getCommunityId())
+				tpBuildingOwnerInfo.eq("org_id", tpUnit.getOrgId())
 						.eq("phase_id", tpUnit.getPhaseId())
 						.eq("building_id", tpUnit.getBuildingId())
 						.eq("unit_id",tpUnit.getId())
@@ -763,7 +763,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			TpBuilding tpBuilding = tpBuildingMapper.selectById(id);
 			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
 			if (null!=tpBuilding) {
-				tpBuildingOwnerInfo.eq("community_id", tpBuilding.getCommunityId())
+				tpBuildingOwnerInfo.eq("org_id", tpBuilding.getOrgId())
 						.eq("phase_id", tpBuilding.getPhaseId())
 						.eq("building_id", tpBuilding.getId())
 						.eq("verify_status", 1);
@@ -777,7 +777,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			TpPhase phase = tpPhaseMapper.selectById(id);
 				QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
 			if (null!=phase) {
-				tpBuildingOwnerInfo.eq("community_id", phase.getCommunityId())
+				tpBuildingOwnerInfo.eq("org_id", phase.getOrgId())
 						.eq("phase_id", phase.getId())
 						.eq("verify_status", 1);
 				}

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

@@ -49,7 +49,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
     private HotelSettingMapper hotelSettingMapper;
     
     @Override
-    public ResponseBean hotelRoomLiset(String parameter, Integer communityId) {
+    public ResponseBean hotelRoomLiset(String parameter, Integer orgId) {
         ResponseBean response= new ResponseBean<>();
         HotelRoom hotelRoom= JSONObject.parseObject(parameter, HotelRoom.class);
 
@@ -64,7 +64,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<HotelRoom> pageInfo = tpHotelRoomMapper.hotelRoomLiset(page,hotelRoom,beginTime,endTime,communityId);
+        IPage<HotelRoom> pageInfo = tpHotelRoomMapper.hotelRoomLiset(page,hotelRoom,beginTime,endTime,orgId);
         List<HotelRoom> hotelRoomList = pageInfo.getRecords();
         for (HotelRoom hotelRoomS:hotelRoomList){
             User user= tpUserMapper.selectById(hotelRoomS.getUpdateUser());
@@ -87,7 +87,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         HotelRoom hotelRoom= JSONObject.parseObject(parameter, HotelRoom.class);
         // 查询当前房间名称是否重复
         QueryWrapper<HotelRoom> HotelRoomName= new QueryWrapper<>();
-        HotelRoomName.eq("community_id",userElement.getOrgId());
+        HotelRoomName.eq("org_id",userElement.getOrgId());
         HotelRoomName.eq("room_name",hotelRoom.getRoomName());
         List<HotelRoom> roomName= tpHotelRoomMapper.selectList(HotelRoomName);
         if (null != roomName && roomName.size()>0){
@@ -96,7 +96,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         }
         // 查询当前房间编号是否重复
 //        QueryWrapper<HotelRoom> HotelRoomQuery= new QueryWrapper<>();
-//        HotelRoomQuery.eq("community_id",userElement.getOrgId());
+//        HotelRoomQuery.eq("org_id",userElement.getOrgId());
 //        HotelRoomQuery.eq("room_no",hotelRoom.getRoomNo());
 //        List<HotelRoom> RoomNo= tpHotelRoomMapper.selectList(HotelRoomQuery);
 //        if (null != RoomNo && RoomNo.size()>0){
@@ -109,7 +109,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
             return response;
         }
         Hotel hotel= tpHotelMapper.selectHotel(userElement.getOrgId());
-        hotelRoom.setCommunityId(userElement.getOrgId())
+        hotelRoom.setOrgId(userElement.getOrgId())
                 .setHotelId(hotel.getId())
                 .setPrice(String.valueOf(hotelRoom.getPrice()))
                 .setCreateDate(LocalDateTime.now())
@@ -131,7 +131,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
                 return response;
             }
             Hotel hotel= tpHotelMapper.selectHotel(userElement.getOrgId());
-            hotelRoom.setCommunityId(userElement.getOrgId())
+            hotelRoom.setOrgId(userElement.getOrgId())
                     .setHotelId(hotel.getId())
                     .setPrice(String.valueOf(hotelRoom.getPrice()))
                     .setUpdateDate(LocalDateTime.now())
@@ -169,23 +169,23 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
     @Override
     public Hotel getHotelData(TaUser userElement) {
         QueryWrapper<Hotel> hotelQueryWrapper = new QueryWrapper<>();
-        hotelQueryWrapper.eq("community_id",userElement.getOrgId());
+        hotelQueryWrapper.eq("org_id",userElement.getOrgId());
         Hotel hotel = tpHotelMapper.selectOne(hotelQueryWrapper);
         if (null != hotel){
             //查看酒店开关是否开启
             QueryWrapper<HotelSetting> hotelSettingQueryWrapper = new QueryWrapper<>();
-            hotelSettingQueryWrapper.eq("community_id",userElement.getOrgId());
+            hotelSettingQueryWrapper.eq("org_id",userElement.getOrgId());
             HotelSetting hotelSetting = hotelSettingMapper.selectOne(hotelSettingQueryWrapper);
             hotel.setHotelSettingValue(null == hotelSetting ? false : true);
             QueryWrapper<TpHotelImg> imgQueryWrapper = new QueryWrapper<>();
-            imgQueryWrapper.eq("community_id",hotel.getCommunityId());
+            imgQueryWrapper.eq("org_id",hotel.getOrgId());
             imgQueryWrapper.eq("hotel_id",hotel.getId());
             imgQueryWrapper.eq("img_type","1");
             TpHotelImg tpHotelImg = hotelImgMapper.selectOne(imgQueryWrapper);
             hotel.setAppIndexImg(tpHotelImg.getImgUrl());
             //获取轮播图
             QueryWrapper<TpHotelImg> imgQueryWrappers = new QueryWrapper<>();
-            imgQueryWrappers.eq("community_id",hotel.getCommunityId());
+            imgQueryWrappers.eq("org_id",hotel.getOrgId());
             imgQueryWrappers.eq("hotel_id",hotel.getId());
             imgQueryWrappers.eq("img_type","2");
             List<TpHotelImg> tpHotelImgList = hotelImgMapper.selectList(imgQueryWrappers);
@@ -215,18 +215,18 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         if (hotel.getHotelSettingValue()){
             // 为true时判断tp_hotel_setting是否存在当前小区
             QueryWrapper<HotelSetting> hotelSettingQuery = new QueryWrapper<>();
-            hotelSettingQuery.eq("community_id",userElement.getOrgId());
+            hotelSettingQuery.eq("org_id",userElement.getOrgId());
             HotelSetting communitySetting= hotelSettingMapper.selectOne(hotelSettingQuery);
             if (null == communitySetting) {
                 HotelSetting hotelSetting = new HotelSetting();
-                hotelSetting.setCommunityId(userElement.getOrgId());
+                hotelSetting.setOrgId(userElement.getOrgId());
                 hotelSetting.setCreateDate(LocalDateTime.now());
                 hotelSetting.setCreateUser(userElement.getUserId());
                 hotelSettingMapper.insert(hotelSetting);
             }
         }else {
             QueryWrapper<HotelSetting> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("community_id",userElement.getOrgId());
+            queryWrapper.eq("org_id",userElement.getOrgId());
             hotelSettingMapper.delete(queryWrapper);
         }
         if (null != hotel.getId()){
@@ -246,13 +246,13 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         TpHotelImg tpHotelImg = new TpHotelImg();
         tpHotelImg.setImgUrl(hotel.getAppIndexImg());
         QueryWrapper<TpHotelImg> tpHotelImgQueryWrapper = new QueryWrapper();
-        tpHotelImgQueryWrapper.eq("community_id",userElement.getOrgId());
+        tpHotelImgQueryWrapper.eq("org_id",userElement.getOrgId());
         tpHotelImgQueryWrapper.eq("hotel_id",hotel.getId());
         tpHotelImgQueryWrapper.eq("img_type","1");
         hotelImgMapper.update(tpHotelImg,tpHotelImgQueryWrapper);
         //更新轮播图
         QueryWrapper<TpHotelImg> deleteImgQueryWrapper = new QueryWrapper();
-        deleteImgQueryWrapper.eq("community_id",userElement.getOrgId());
+        deleteImgQueryWrapper.eq("org_id",userElement.getOrgId());
         deleteImgQueryWrapper.eq("hotel_id",hotel.getId());
         deleteImgQueryWrapper.eq("img_type","2");
         hotelImgMapper.delete(deleteImgQueryWrapper);
@@ -261,13 +261,13 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
     }
     
     private void addFirstHotel(Hotel hotel, TaUser userElement) {
-        hotel.setCommunityId(userElement.getOrgId());
+        hotel.setOrgId(userElement.getOrgId());
         hotel.setCreateDate(LocalDateTime.now());
         hotel.setCreateUser(userElement.getUserId());
         tpHotelMapper.insert(hotel);
         //添加首页图
         TpHotelImg tpHotelImg = new TpHotelImg();
-        tpHotelImg.setCommunityId(userElement.getOrgId());
+        tpHotelImg.setOrgId(userElement.getOrgId());
         tpHotelImg.setCreateDate(LocalDateTime.now());
         tpHotelImg.setHotelId(hotel.getId());
         tpHotelImg.setImgType("1");
@@ -282,7 +282,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         List<TpHotelImg> hotelImgList = new ArrayList<>();
         imgList.stream().forEach(e -> {
             TpHotelImg hotelImg = new TpHotelImg();
-            hotelImg.setCommunityId(userElement.getOrgId());
+            hotelImg.setOrgId(userElement.getOrgId());
             hotelImg.setCreateDate(LocalDateTime.now());
             hotelImg.setHotelId(hotel.getId());
             hotelImg.setImgType("2");

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

@@ -35,10 +35,10 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 	@Override
 	public Map<String, Object> getIndexCount(TaUser userElement) {
 		Map<String,Object> map = new HashMap<>();
-		Integer communityId = userElement.getOrgId();
+		Integer orgId = userElement.getOrgId();
 		
 		//历史工单统计和今日工单统计
-		Map<String,Object> ticketMap = getTicketMap(communityId);
+		Map<String,Object> ticketMap = getTicketMap(orgId);
 		
 		//历史工单统计表
 		Map<String,Object> historyMap = new HashMap<>();
@@ -53,25 +53,25 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 		todayMap.put("todayContactTicket",ticketMap.get("todayContactTicket"));
 		
 		//今日小区智能硬件数据统计
-		Map<String,Object> hardwareMap = getHardwareMap(communityId);
+		Map<String,Object> hardwareMap = getHardwareMap(orgId);
 		
 		//获取收费组总缴费统计
-		List<TpBillInvoiceCount> billInvoiceCountList = indexCountMapper.getBillInvoiceCountList(communityId);
+		List<TpBillInvoiceCount> billInvoiceCountList = indexCountMapper.getBillInvoiceCountList(orgId);
 		
 			//获取月租车总续费统计
-		List<TaUserLicenseCount> taUserLicenseCountList = indexCountMapper.getUserLicenseCountList(communityId);
+		List<TaUserLicenseCount> taUserLicenseCountList = indexCountMapper.getUserLicenseCountList(orgId);
 		
 		//获取临时车总缴费统计
-		List<TaTemporaryLicenseCount> taTemporaryLicenseCountList = indexCountMapper.getTemporaryLicenseCountList(communityId);
+		List<TaTemporaryLicenseCount> taTemporaryLicenseCountList = indexCountMapper.getTemporaryLicenseCountList(orgId);
 		
 		//获取注册用户数数据
-		Map<String,Object> registerUserMap = getRegisterUserMap(communityId);
+		Map<String,Object> registerUserMap = getRegisterUserMap(orgId);
 		
 		//获取日活跃用户
-		List<TaBriskUser> taBriskUserList = indexCountMapper.getBriskUserList(communityId);
+		List<TaBriskUser> taBriskUserList = indexCountMapper.getBriskUserList(orgId);
 		
 		//获取已发布内容统计
-		Map<String,Object> publishContentMap = getPublishContentMap(communityId);
+		Map<String,Object> publishContentMap = getPublishContentMap(orgId);
 		
 		map.put("historyMap",historyMap);
 		map.put("todayMap",todayMap);
@@ -87,17 +87,17 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 	
 	/**
 	 * 获取已发布内容统计
-	 * @param communityId
+	 * @param orgId
 	 * @return
 	 */
-	private Map<String, Object> getPublishContentMap(Integer communityId) {
+	private Map<String, Object> getPublishContentMap(Integer orgId) {
 		Map<String,Object> map = new HashMap<>();
 		//获取公告数量
-		Integer announcementCount = indexCountMapper.getAnnouncementCount(communityId);
+		Integer announcementCount = indexCountMapper.getAnnouncementCount(orgId);
 		//获取活动数量
-		Integer activityCount = indexCountMapper.getActivityCount(communityId);
+		Integer activityCount = indexCountMapper.getActivityCount(orgId);
 		//获取话题数量
-		Integer topicCount = indexCountMapper.getTopicCount(communityId);
+		Integer topicCount = indexCountMapper.getTopicCount(orgId);
 		
 		map.put("announcementCount",announcementCount);
 		map.put("activityCount",activityCount);
@@ -107,15 +107,15 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 	
 	/**
 	 * 获取注册用户数据
-	 * @param communityId
+	 * @param orgId
 	 * @return
 	 */
-	private Map<String, Object> getRegisterUserMap(Integer communityId) {
+	private Map<String, Object> getRegisterUserMap(Integer orgId) {
 		Map<String,Object> map = new HashMap<>();
 		// 1 是户主 2 是租客 3 是家属
-		Integer houseOwnerCount = indexCountMapper.getRegisterUserCount(communityId,1);
-		Integer houseTenantCount = indexCountMapper.getRegisterUserCount(communityId,2);
-		Integer houseRelationCount = indexCountMapper.getRegisterUserCount(communityId,3);
+		Integer houseOwnerCount = indexCountMapper.getRegisterUserCount(orgId,1);
+		Integer houseTenantCount = indexCountMapper.getRegisterUserCount(orgId,2);
+		Integer houseRelationCount = indexCountMapper.getRegisterUserCount(orgId,3);
 		map.put("houseOwnerCount",houseOwnerCount);
 		map.put("houseTenantCount",houseTenantCount);
 		map.put("houseRelationCount",houseRelationCount);
@@ -124,10 +124,10 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 	
 	/**
 	 * 获取硬件数据统计
-	 * @param communityId
+	 * @param orgId
 	 * @return
 	 */
-	private Map<String, Object> getHardwareMap(Integer communityId) {
+	private Map<String, Object> getHardwareMap(Integer orgId) {
 		Map<String,Object> map = new HashMap<>();
 		Integer result = indexCountMapper.selectCommunityOpenDoorCount();
 		
@@ -139,11 +139,11 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 		Integer openCount = brushCardUnitsOpenDoorCount + brushFaceUunitsOpenDoorCount;
 		
 		//公区摄像头查看次数
-		Integer publicCameraCount = indexCountMapper.getPublicCameraCount(communityId);
+		Integer publicCameraCount = indexCountMapper.getPublicCameraCount(orgId);
 		//单元门远程监控查看
-		Integer remoteMonitoringCount = indexCountMapper.getRemoteMonitoringCount(communityId);
+		Integer remoteMonitoringCount = indexCountMapper.getRemoteMonitoringCount(orgId);
 		//单元门远程开门
-		Integer remoteUnitCount = indexCountMapper.getRemoteUnitCount(communityId);
+		Integer remoteUnitCount = indexCountMapper.getRemoteUnitCount(orgId);
 		
 		map.put("communityCount",result);
 		map.put("unitCount",openCount);
@@ -157,9 +157,9 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 	/**
 	 * 历史工单统计
 	 */
-	private Map<String, Object> getTicketMap(Integer communityId) {
+	private Map<String, Object> getTicketMap(Integer orgId) {
 		Map<String,Object> Map = new HashMap<>();
-		List<TpTicket> ticketList = indexCountMapper.getTicketList(communityId);
+		List<TpTicket> ticketList = indexCountMapper.getTicketList(orgId);
 		//已解决：状态为待评价+已评价+拒绝受理+被终止的工单总和
 		List<TpTicket> solvedTicketList = new ArrayList<>();
 		//未解决：等待分配 + 待处理 +正在处理

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

@@ -31,7 +31,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
     @Autowired
     private MessageMapper messageMapper;
     @Override
-    public ResponseBean messageLiset(String parameter, Integer communityId,Integer user) {
+    public ResponseBean messageLiset(String parameter, Integer orgId,Integer user) {
         ResponseBean response= new  ResponseBean();
         JSONObject object = JSONObject.parseObject(parameter);
         //待办消息类型(-1:论坛，-2:工单，-3:缴费)
@@ -59,7 +59,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
     }
 
     @Override
-    public ResponseBean myMessageList(String parameter, Integer communityId, Integer user) {
+    public ResponseBean myMessageList(String parameter, Integer orgId, Integer user) {
         ResponseBean response= new  ResponseBean();
         JSONObject object = JSONObject.parseObject(parameter);
         //待办消息类型(-1:论坛，-2:工单，-3:缴费)

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

@@ -57,7 +57,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		// 分页查询
 		SysRole role = new SysRole();
 		role.setRoleName(roleName);
-		role.setCommunityId(userElement.getOrgId());
+		role.setOrgId(userElement.getOrgId());
 		List<SysRole> list = roleMapper.getRoleListByParams(page,role);
 		Map<String, Object> map = Maps.newHashMap();
 		map.put("list",list);
@@ -77,7 +77,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	public ResponseBean addRole(SysRole sysRole, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		//接收数据
-		sysRole.setCommunityId(userElement.getOrgId());
+		sysRole.setOrgId(userElement.getOrgId());
 		Integer userId = userElement.getUserId();
 		LocalDateTime dateTime = LocalDateTime.now();
 		sysRole.setCreateUser(userId);
@@ -110,7 +110,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 
 		menuIdList.stream().forEach(menuId -> {
 			SysRoleMenu sysRoleMenu = new SysRoleMenu();
-			sysRoleMenu.setCommunityId(sysRole.getCommunityId());
+			sysRoleMenu.setOrgId(sysRole.getOrgId());
 			sysRoleMenu.setRoleId(sysRole.getId());
 			sysRoleMenu.setMenuId(menuId);
 			sysRoleMenuList.add(sysRoleMenu);
@@ -132,7 +132,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		SysRole sysRole = roleMapper.selectById(id);
 		QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("role_id", id);
-		queryWrapper.eq("community_id", sysRole.getCommunityId());
+		queryWrapper.eq("org_id", sysRole.getOrgId());
 		List<Integer> menuArray = new ArrayList<Integer>();
 		//查询这条角色对应的权限
 		List<SysRoleMenu> sysRoleMenuList = sysRoleMenuMapper.selectList(queryWrapper);
@@ -155,7 +155,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	public ResponseBean updateRole(SysRole sysRole, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		//接收数据
-		sysRole.setCommunityId(userElement.getOrgId());
+		sysRole.setOrgId(userElement.getOrgId());
 		sysRole.setUpdateUser(userElement.getUserId());
 		sysRole.setUpdateDate(LocalDateTime.now());
 		//校验角色名不能相同
@@ -173,7 +173,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		//维护角色与menu的关系表,先全部删除,在重新添加
 		QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("role_id", sysRole.getId());
-		queryWrapper.eq("community_id", sysRole.getCommunityId());
+		queryWrapper.eq("org_id", sysRole.getOrgId());
 		sysRoleMenuMapper.delete(queryWrapper);
 
 		//重新添加
@@ -207,13 +207,13 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		sysRoleIdList.stream().forEach(roleId -> {
 			QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("role_id", roleId);
-			queryWrapper.eq("community_id", userElement.getOrgId());
+			queryWrapper.eq("org_id", userElement.getOrgId());
 			sysRoleMenuMapper.delete(queryWrapper);
 
 			// 删除角色和用户关系
 			QueryWrapper<SysUserRole> deleteQueryWrapper = new QueryWrapper<>();
 			deleteQueryWrapper.eq("role_id", roleId);
-			deleteQueryWrapper.eq("community_id", userElement.getOrgId());
+			deleteQueryWrapper.eq("org_id", userElement.getOrgId());
 			sysUserRoleMapper.delete(deleteQueryWrapper);
 		});
 

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

@@ -49,7 +49,7 @@ public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrde
         queryWrapper.like(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
         queryWrapper.like(StringUtils.isNotBlank(paymentName), "payment_name", paymentName);
         queryWrapper.like(StringUtils.isNotBlank(paymentTel), "payment_tel", paymentTel);
-        queryWrapper.eq("community_id", userElement.getOrgId());
+        queryWrapper.eq("org_id", userElement.getOrgId());
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaUserLicenseOrder> orderIPage = this.page(page, queryWrapper);

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

@@ -100,7 +100,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 
 
 //        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
-//        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getCommunityId(), userVerify.getPhaseId(),
+//        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getOrgId(), userVerify.getPhaseId(),
 //                userVerify.getBuildingId(), userVerify.getUnitId(),
 //                userVerify.getLevelId(), userVerify.getRoomNoId(),
 //                taUser.getLoginName());
@@ -120,7 +120,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         String[] messageArr= new messagePush().messagePushAll( );
         for (String count : messageArr) {
             Message message = new Message();
-            message.setCommunityId(userVerify.getCommunityId());
+            message.setOrgId(userVerify.getOrgId());
             message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
@@ -160,7 +160,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         }
 
         // 校验当前身份 和 角色，是否有审核通过的！
-        hasUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userVerify.getUserId(), userVerify.getCommunityId(), userVerify.getPhaseId(),
+        hasUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userVerify.getUserId(), userVerify.getOrgId(), userVerify.getPhaseId(),
                 userVerify.getBuildingId(), userVerify.getUnitId(),
                 userVerify.getLevelId(), userVerify.getRoomNoId(), userVerify.getRoleId());
         if (null != hasUserVerify) {
@@ -183,7 +183,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         TpLevel tpLevel = tpLevelMapper.selectById(userVerify.getLevelId());
         TpRoomNo tpRoomNo = tpRoomNoMapper.selectById(userVerify.getRoomNoId());
         TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-        tpBuildingOwnerInfo.setCommunityId(userVerify.getCommunityId());
+        tpBuildingOwnerInfo.setOrgId(userVerify.getOrgId());
 //        tpBuildingOwnerInfo.setIdCard(taUser.getIdCard());
         tpBuildingOwnerInfo.setPhaseId(tpPhase.getId());
         tpBuildingOwnerInfo.setPhaseName(tpPhase.getName());
@@ -230,7 +230,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 //        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
         // 物业人员
         User user = userMapper.selectById(userElement.getUserId());
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getCommunityId(), userVerify.getPhaseId(),
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getOrgId(), userVerify.getPhaseId(),
                 userVerify.getBuildingId(), userVerify.getUnitId(),
                 userVerify.getLevelId(), userVerify.getRoomNoId(),
                 null
@@ -258,7 +258,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         String[] messageArr= new messagePush().messagePushAll( );
         for (String count : messageArr) {
             Message message = new Message();
-            message.setCommunityId(userVerify.getCommunityId());
+            message.setOrgId(userVerify.getOrgId());
             message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");

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

@@ -28,7 +28,7 @@ public class TaVisitorLicenseSettingServiceImpl extends ServiceImpl<TaVisitorLic
         ResponseBean responseBean = new ResponseBean();
 
         QueryWrapper<TaVisitorLicenseSetting> visitorLicenseSettingQueryWrapper = new QueryWrapper<>();
-        visitorLicenseSettingQueryWrapper.eq("community_id", userElement.getOrgId());
+        visitorLicenseSettingQueryWrapper.eq("org_id", userElement.getOrgId());
         TaVisitorLicenseSetting taVisitorLicenseSetting = this.getOne(visitorLicenseSettingQueryWrapper);
 
         // true 表示开启访客邀请车辆
@@ -38,7 +38,7 @@ public class TaVisitorLicenseSettingServiceImpl extends ServiceImpl<TaVisitorLic
                 return responseBean;
             }
             TaVisitorLicenseSetting visitorLicenseSetting = new TaVisitorLicenseSetting();
-            visitorLicenseSetting.setCommunityId(userElement.getOrgId());
+            visitorLicenseSetting.setOrgId(userElement.getOrgId());
             visitorLicenseSetting.setCreateDate(LocalDateTime.now());
             visitorLicenseSetting.setCreateUser(userElement.getUserId());
 
@@ -61,7 +61,7 @@ public class TaVisitorLicenseSettingServiceImpl extends ServiceImpl<TaVisitorLic
         ResponseBean responseBean = new ResponseBean();
 
         QueryWrapper<TaVisitorLicenseSetting> visitorLicenseSettingQueryWrapper = new QueryWrapper<>();
-        visitorLicenseSettingQueryWrapper.eq("community_id", userElement.getOrgId());
+        visitorLicenseSettingQueryWrapper.eq("org_id", userElement.getOrgId());
         TaVisitorLicenseSetting visitorLicenseSetting = this.getOne(visitorLicenseSettingQueryWrapper);
         // true 表示启用了访客邀请的车辆， false 表示未启用访客邀请的车辆
         responseBean.addSuccess(null != visitorLicenseSetting ? true : false);