调整

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -6,9 +6,12 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
@@ -41,6 +44,24 @@ public class BaseController {
         return null;
     }
 
+    /**
+     * 获取用户信息
+     * @pa request
+     * @return
+     */
+    public TaUser getTaUser(HttpServletRequest request) {
+        TaUser taUser = new TaUser();
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("orgId")) {
+             taUser.setOrgId(Integer.valueOf(map.get("orgId").toString()));
+        }
+        if (null != map && null != map.get("userId")) {
+            taUser.setUserId(Integer.valueOf(map.get("userId").toString()));
+        }
+
+        return taUser;
+    }
+
     public Integer getChannelId(HttpServletRequest request) {
 
         Map map = JWTUtils.getUserIdAndOrgId(request);
@@ -140,5 +161,29 @@ public class BaseController {
         }
         return taPersonBuildingList;
     }
+
+    /**
+     * 发送响应流方法
+     */
+    protected void setResponseHeader(HttpServletResponse response, String fileName) {
+        try {
+            try {
+                fileName = new String(fileName.getBytes(),"utf-8");
+            } catch (UnsupportedEncodingException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+//            response.setContentType("application/octet-stream;charset=ISO8859-1");
+//            response.setHeader("Content-Disposition", "attachment;filename="+ fileName);
+//            response.addHeader("Pargam", "no-cache");
+//            response.addHeader("Cache-Control", "no-cache");
+
+            response.setContentType("multipart/form-data");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename="+fileName);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
 }
 

src/main/java/com/huiju/estateagents/base/UserControl.java

@@ -1,38 +0,0 @@
-package com.huiju.estateagents.base;
-
-import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.exception.EstaException;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpSession;
-
-/**
- * 用户控制
- */
-public class UserControl {
-
-    /**
-     * 获取用户信息
-     * @return
-     */
-    public static TaUser getUser() {
-        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
-        HttpSession session = servletRequestAttributes.getRequest().getSession();
-        TaUser taUser = (TaUser) session.getAttribute("miniapp_user");
-        if (null == taUser) {
-            throw new EstaException("用户信息不存在, 请登录!");
-        }
-        return taUser;
-    }
-
-    /**
-     * 获取公司 org_id
-     * @return
-     */
-    public static Integer getOrgId() {
-        TaUser user = getUser();
-        return user.getOrgId();
-    }
-
-}

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

@@ -213,7 +213,7 @@ public class TaBuildingController extends BaseController {
      */
     @ApiOperation(value = "添加户型", notes = "添加户型")
     @RequestMapping(value = "/admin/buildingApartment/add", method = RequestMethod.POST)
-    public ResponseBean buildingApartment(@RequestBody String parameter, HttpSession session) {
+    public ResponseBean buildingApartment(@RequestBody String parameter, HttpServletRequest request) {
         return taBuildingService.buildingApartmentAdd(parameter);
     }
 

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -161,7 +161,7 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     @RequestMapping(value = "/admin/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") String id, HttpSession session){
+    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") String id, HttpServletRequest request){
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/property/common/base/BaseController.java

@@ -1,90 +0,0 @@
-package com.huiju.estateagents.property.common.base;
-
-import com.huiju.estateagents.property.common.Constant;
-import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.exception.WisdomException;
-import com.huiju.estateagents.property.vo.UserVO;
-import lombok.extern.slf4j.Slf4j;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.UnsupportedEncodingException;
-
-/**
- * @author FXF
- * @date 2018-12-18
- */
-@Slf4j
-public class BaseController {
-    
-    /**
-     * 获取 UserElement
-     * @param session
-     * @return
-     */
-    protected UserElement getUserElement(HttpSession session){
-        log.info("获取sessionId: {}", session.getId());
-        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
-        if (null == userElement) {
-            throw new WisdomException("用户凭证不存在!");
-        }
-        return userElement;
-    }
-
-    /**
-     * 获取 UserElement
-     * @param session
-     * @return
-     */
-    protected void setUserElement(HttpSession session, UserVO userVO){
-        log.info("获取sessionId: {}", session.getId());
-        UserElement userElement = new UserElement();
-        userElement.setId(userVO.getId());
-        userElement.setCommunityId(userVO.getCommunityId());
-        userElement.setEmail(userVO.getEmail());
-        userElement.setLoginName(userVO.getLoginName());
-        userElement.setUserName(userVO.getUserName());
-        userElement.setStatus(userVO.getStatus());
-        userElement.setLoginType(Constant.WEB_LOGIN_TYPE);
-
-        session.setAttribute(Constant.WEB_USER_SESSION, userElement);
-    }
-
-
-    /**
-     * 清除 用户 session
-     * @param session
-     */
-    protected void cleanUserSession(HttpSession session){
-        log.info("退出登陆!");
-        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
-        if (null != userElement) {
-            session.setAttribute(Constant.WEB_USER_SESSION, null);
-        }
-    }
-
-    /**
-     * 发送响应流方法
-     */
-    protected void setResponseHeader(HttpServletResponse response, String fileName) {
-        try {
-            try {
-                fileName = new String(fileName.getBytes(),"utf-8");
-            } catch (UnsupportedEncodingException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-//            response.setContentType("application/octet-stream;charset=ISO8859-1");
-//            response.setHeader("Content-Disposition", "attachment;filename="+ fileName);
-//            response.addHeader("Pargam", "no-cache");
-//            response.addHeader("Cache-Control", "no-cache");
-
-            response.setContentType("multipart/form-data");
-            response.setCharacterEncoding("utf-8");
-            response.setHeader("Content-disposition", "attachment;filename="+fileName);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-}

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

@@ -2,9 +2,10 @@ package com.huiju.estateagents.property.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.AnnouncementTel;
 import com.huiju.estateagents.property.service.IAnnouncementTelService;
 import io.swagger.annotations.Api;
@@ -51,11 +52,11 @@ public class AnnouncementTelController extends BaseController {
                                 @RequestParam(value = "tel", required = false) String tel,
                                 @RequestParam(value = "remark", required = false) String remark,
                                 @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		AnnouncementTel announcementTel = new AnnouncementTel();
-		announcementTel.setCommunityId(userElement.getCommunityId());
+		announcementTel.setCommunityId(userElement.getOrgId());
 		announcementTel.setName(name);
 		announcementTel.setTel(tel);
 		announcementTel.setRemark(remark);
@@ -69,7 +70,7 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/tel/add",method = RequestMethod.POST)
-	public ResponseBean addTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpSession session){
+	public ResponseBean addTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
 
 //		if (!AccountValidatorUtil.isNumber(announcementTel.getTel())) {
@@ -77,19 +78,19 @@ public class AnnouncementTelController extends BaseController {
 //			return responseBean;
 //		}
 
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
 		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());
-		announcementTelQueryWrapper.eq("community_id", userElement.getCommunityId());
+		announcementTelQueryWrapper.eq("community_id", userElement.getOrgId());
 		AnnouncementTel telServiceOne = announcementTelService.getOne(announcementTelQueryWrapper);
 		if (null != telServiceOne) {
 			responseBean.addError("此号码已存在");
 			return responseBean;
 		}
 		LocalDateTime time = LocalDateTime.now();
-		announcementTel.setCommunityId(userElement.getCommunityId());
-		announcementTel.setCreateUser(userElement.getId());
-		announcementTel.setUpdateUser(userElement.getId());
+		announcementTel.setCommunityId(userElement.getOrgId());
+		announcementTel.setCreateUser(userElement.getUserId());
+		announcementTel.setUpdateUser(userElement.getUserId());
 		announcementTel.setCreateDate(time);
 		announcementTel.setUpdateDate(time);
 		boolean state = announcementTelService.save(announcementTel);
@@ -107,7 +108,7 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/tel/update", method = RequestMethod.PUT)
-	public ResponseBean updateTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpSession session) {
+	public ResponseBean updateTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
 		boolean isPhone = true;
 		boolean isLandline = true;
@@ -125,13 +126,13 @@ public class AnnouncementTelController extends BaseController {
 //			responseBean.addError("输入的号码不正确!");
 //			return responseBean;
 //		}
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
 		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());
-		announcementTelQueryWrapper.eq("community_id", userElement.getCommunityId());
+		announcementTelQueryWrapper.eq("community_id", userElement.getOrgId());
 		AnnouncementTel telServiceOne = announcementTelService.getOne(announcementTelQueryWrapper);
 		if (null != telServiceOne && announcementTel.getTel().equals(telServiceOne.getTel()) && announcementTel.getId().equals(telServiceOne.getId())) {
-			announcementTel.setUpdateUser(userElement.getId());
+			announcementTel.setUpdateUser(userElement.getUserId());
 			announcementTel.setUpdateDate(LocalDateTime.now());
 			announcementTelService.updateById(announcementTel);
 			responseBean.addSuccess("修改物业端号码成功");
@@ -141,7 +142,7 @@ public class AnnouncementTelController extends BaseController {
 			responseBean.addError("此号码已存在");
 			return responseBean;
 		}
-		announcementTel.setUpdateUser(userElement.getId());
+		announcementTel.setUpdateUser(userElement.getUserId());
 		announcementTel.setUpdateDate(LocalDateTime.now());
 		boolean state = announcementTelService.updateById(announcementTel);
 		if (state){
@@ -171,7 +172,7 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/tel/delete", method = RequestMethod.POST)
-	public ResponseBean deleteNotice(@RequestBody List<Integer> ids, HttpSession session) {
+	public ResponseBean deleteNotice(@RequestBody List<Integer> ids, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
 		boolean state = announcementTelService.removeByIds(ids);
 		if (state){

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

@@ -1,9 +1,10 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.Bill;
 import com.huiju.estateagents.property.service.IBillService;
 import io.swagger.annotations.Api;
@@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.OutputStream;
@@ -54,14 +56,14 @@ public class BillController extends BaseController {
                                 @RequestParam(value = "billName", required = false) String billName,
                                 @RequestParam(value = "billExplain", required = false) String billExplain,
                                 @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         Bill bill = new Bill();
         bill.setId(billId);
         bill.setBillName(billName);
         bill.setBillExplain(billExplain);
-        bill.setCommunityId(userElement.getCommunityId());
+        bill.setCommunityId(userElement.getOrgId());
         responseBean = iBillService.getBillList(bill,pageNum,pageSize);
         return responseBean;
     }
@@ -71,7 +73,7 @@ public class BillController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "id编号")
     })
     @RequestMapping(value = "/bill/{id}", method = RequestMethod.GET)
-    public ResponseBean getByBillId(HttpSession session, @PathVariable("id") Integer id) {
+    public ResponseBean getByBillId(HttpServletRequest request, @PathVariable("id") Integer id) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iBillService.getByBillId(id);
         return responseBean;
@@ -79,16 +81,16 @@ public class BillController extends BaseController {
 
     @ApiOperation(value = "上传缴费项接口, 预览", notes = "上传缴费项接口, 预览")
     @PostMapping(value = "/bill/uploadExcel/get", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
+    public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillService.getExcelData(file, userElement);
         return responseBean;
     }
 
     @ApiOperation(value = "上传缴费项接口, 保存/修改", notes = "上传缴费项接口, 保存/修改")
     @PostMapping(value = "/bill/uploadExcel/add", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public ResponseBean addUploadExcel(HttpSession session,
+    public ResponseBean addUploadExcel(HttpServletRequest request,
                                        @RequestParam(value = "billId", required = false) Integer billId,
                                        @RequestParam(value = "file", required = false) MultipartFile file,
                                        @RequestParam("billExplain") String billExplain,
@@ -96,7 +98,7 @@ public class BillController extends BaseController {
                                        @RequestParam("endDate") String endDate,
                                        @RequestParam("billStatus") String billStatus) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = null;
         try {
@@ -116,12 +118,12 @@ public class BillController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "billStatus", value = "状态 0：正在收费  2： 草稿")
     })
     @RequestMapping(value = "/bill/updateBillStatus/{id}", method = RequestMethod.PUT)
-    public ResponseBean updateBillStatus(HttpSession session,
+    public ResponseBean updateBillStatus(HttpServletRequest request,
                                          @RequestParam("billStatus") Integer billStatus,
                                          @PathVariable("id") Integer id) {
 
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillService.updateBillStatus(userElement, billStatus, id);
         return responseBean;
     }
@@ -132,11 +134,11 @@ public class BillController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/deleteBillBeach", method = RequestMethod.POST)
-    public ResponseBean deleteBillBeach(HttpSession session,
+    public ResponseBean deleteBillBeach(HttpServletRequest request,
                                         @RequestBody List<Integer> ids) {
 
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillService.deleteBillBeach(userElement, ids);
         return responseBean;
     }
@@ -147,8 +149,8 @@ public class BillController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/downloadExcel", method = RequestMethod.GET)
-    public void exportExcel(HttpServletResponse response, HttpSession session) {
-        UserElement userElement = getUserElement(session);
+    public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
+        TaUser userElement = getTaUser(request);
         HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement).getData();
         this.setResponseHeader(response, "缴费单模板.xls");
         //响应到客户端

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

@@ -2,9 +2,10 @@ package com.huiju.estateagents.property.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.BillInvoice;
 import com.huiju.estateagents.property.service.IBillInvoiceService;
 import com.huiju.estateagents.property.service.IBillService;
@@ -17,6 +18,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.OutputStream;
@@ -50,9 +52,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
     })
     @RequestMapping(value = "/bill/invoice/list", method = RequestMethod.POST)
-    public ResponseBean getBillList(HttpSession session, @RequestBody String parameter) {
+    public ResponseBean getBillList(HttpServletRequest request, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillInvoiceService.getBillList(parameter, userElement);
         return responseBean;
     }
@@ -63,10 +65,10 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/updateBill", method = RequestMethod.PUT)
-    public ResponseBean updateBill(HttpSession session, @RequestBody String parameter) {
+    public ResponseBean updateBill(HttpServletRequest request, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
 
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillService.updateBillNameAndBillExplainAndEndDate(userElement, parameter);
         return responseBean;
     }
@@ -77,9 +79,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/delete", method = RequestMethod.POST)
-    public ResponseBean delete(HttpSession session, @RequestBody List<Integer> ids) {
+    public ResponseBean delete(HttpServletRequest request, @RequestBody List<Integer> ids) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
 
         responseBean = iBillInvoiceService.deleteBillInvoice(ids, userElement);
         return responseBean;
@@ -91,9 +93,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/offlinePayment", method = RequestMethod.POST)
-    public ResponseBean offlinePayment(HttpSession session, @RequestBody List<Integer> ids) {
+    public ResponseBean offlinePayment(HttpServletRequest request, @RequestBody List<Integer> ids) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
 
         responseBean = iBillInvoiceService.offlinePayment(ids, userElement);
         return responseBean;
@@ -106,9 +108,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/addTempBillInvoice", method = RequestMethod.POST)
-    public ResponseBean addTempBillInvoice(HttpSession session, @RequestBody String parameter) {
+    public ResponseBean addTempBillInvoice(HttpServletRequest request, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillInvoiceService.addTempBillInvoice(parameter, userElement);
         return responseBean;
     }
@@ -119,9 +121,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/updateBillInvoiceStatus", method = RequestMethod.POST)
-    public ResponseBean updateBillInvoiceStatus(HttpSession session, @RequestBody List<Integer> ids) {
+    public ResponseBean updateBillInvoiceStatus(HttpServletRequest request, @RequestBody List<Integer> ids) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillInvoiceService.updateBillInvoiceStatus(ids, userElement);
         return responseBean;
     }
@@ -132,9 +134,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/getTempBillInvoice/{billId}", method = RequestMethod.GET)
-    public ResponseBean getTempBillInvoice(HttpSession session, @PathVariable("billId") Integer billId) {
+    public ResponseBean getTempBillInvoice(HttpServletRequest request, @PathVariable("billId") Integer billId) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillInvoiceService.getTempBillInvoice(billId, userElement);
         return responseBean;
     }
@@ -145,9 +147,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/deleteTempBillInvoice/{billId}", method = RequestMethod.DELETE)
-    public ResponseBean deleteTempBillInvoice(HttpSession session, @PathVariable("billId") Integer billId) {
+    public ResponseBean deleteTempBillInvoice(HttpServletRequest request, @PathVariable("billId") Integer billId) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillInvoiceService.deleteTempBillInvoice(billId, userElement);
         return responseBean;
     }
@@ -159,9 +161,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/updateBillInvoiceIdPayPrice/{billId}", method = RequestMethod.POST)
-    public ResponseBean updateBillInvoiceIdPayPrice(HttpSession session, @PathVariable Integer billId, @RequestBody String parameter) {
+    public ResponseBean updateBillInvoiceIdPayPrice(HttpServletRequest request, @PathVariable Integer billId, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         Double payPrice = JSONObject.parseObject(parameter).getDouble("payPrice");
 //        responseBean = iBillInvoiceService.updateBillInvoiceIdPayPrice(billId, PayPriceUtils.yuanConversionPoints(payPrice) , userElement);
         return responseBean;
@@ -174,9 +176,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/updateBillInvoiceIdBillInvoiceExplain/{billId}", method = RequestMethod.POST)
-    public ResponseBean updateBillInvoiceIdBillInvoiceExplain(HttpSession session, @PathVariable Integer billId, @RequestBody String parameter) {
+    public ResponseBean updateBillInvoiceIdBillInvoiceExplain(HttpServletRequest request, @PathVariable Integer billId, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         String billInvoiceExplain = JSONObject.parseObject(parameter).getString("billInvoiceExplain");
         if (StringUtils.isBlank(billInvoiceExplain)) {
             responseBean.addError("收费说明不能为空!");
@@ -200,9 +202,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/exportExcel/{billId}", method = RequestMethod.GET)
-    public void exportExcel(HttpServletResponse response, HttpSession session, @PathVariable("billId") Integer billId) {
+    public void exportExcel(HttpServletResponse response, HttpServletRequest request, @PathVariable("billId") Integer billId) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         HSSFWorkbook workbook = (HSSFWorkbook) iBillInvoiceService.exportExcel(userElement, billId).getData();
         this.setResponseHeader(response, "缴费单.xls");
         //响应到客户端
@@ -224,9 +226,9 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/invoice/getInvoiceInvalid", method = RequestMethod.POST)
-    public ResponseBean getInvoiceInvalid(HttpSession session, @RequestBody String parameter) {
+    public ResponseBean getInvoiceInvalid(HttpServletRequest request, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillInvoiceService.getInvoiceInvalid(userElement, parameter);
         return responseBean;
     }

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

@@ -1,9 +1,10 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.IBillOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -40,9 +42,9 @@ public class BillOrderController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "Token"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "orderNumber", value = "订单号")
     })
-    public ResponseBean getByOrderNumberBillInvoice(HttpSession session, @PathVariable("orderNumber") String orderNumber) {
+    public ResponseBean getByOrderNumberBillInvoice(HttpServletRequest request, @PathVariable("orderNumber") String orderNumber) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillOrderService.getByOrderNumberBillInvoice(userElement, orderNumber);
         return responseBean;
     }

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

@@ -1,9 +1,10 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.IBillStatementService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.OutputStream;
@@ -44,9 +46,9 @@ public class BillStatementController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/bill/statement/all", method = RequestMethod.POST)
-    public ResponseBean getBillStatement(HttpSession session, @RequestBody String parameter) {
+    public ResponseBean getBillStatement(HttpServletRequest request, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBillStatementService.getBillStatement(userElement, parameter);
         return responseBean;
     }
@@ -56,9 +58,9 @@ public class BillStatementController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/bill/statement/exportExcel", method = RequestMethod.GET)
-    public void exportExcel(HttpServletResponse response, HttpSession session) {
+    public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         HSSFWorkbook workbook = (HSSFWorkbook) iBillStatementService.exportExcel(userElement).getData();
         this.setResponseHeader(response, "流水信息.xls");
         //响应到客户端

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

@@ -2,12 +2,11 @@ package com.huiju.estateagents.property.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.TaFace;
-import com.huiju.estateagents.property.model.TaUser;
 import com.huiju.estateagents.property.model.TaUserVerify;
 import com.huiju.estateagents.property.service.IBuildingOwnerInfoService;
 import com.huiju.estateagents.property.service.ITaFaceService;
@@ -22,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.OutputStream;
@@ -59,9 +59,9 @@ public class BuildingOwnerInfoController extends BaseController {
                     "pageNum第几页;pageSize 一页多少行;")
     })
     @RequestMapping(value = "/building/list", method = RequestMethod.POST)
-    public ResponseBean getList(@RequestBody String parameter, HttpSession session){
+    public ResponseBean getList(@RequestBody String parameter, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBuildingOwnerInfoService.listQuery(parameter, userElement);
         return responseBean;
     }
@@ -123,9 +123,9 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/update", method = RequestMethod.PUT)
-    public ResponseBean update(@RequestBody String parameter, HttpSession session){
+    public ResponseBean update(@RequestBody String parameter, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBuildingOwnerInfoService.update(parameter, userElement);
         return responseBean;
     }
@@ -139,9 +139,9 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/add", method = RequestMethod.POST)
-    public ResponseBean add(@RequestBody String parameter, HttpSession session){
+    public ResponseBean add(@RequestBody String parameter, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iBuildingOwnerInfoService.add(parameter, userElement);
         return responseBean;
     }
@@ -152,10 +152,10 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/delete", method = RequestMethod.DELETE)
-    public ResponseBean delete(@RequestBody List<Integer> ids, HttpSession session){
+    public ResponseBean delete(@RequestBody List<Integer> ids, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.deleteIds(ids, userElement.getId());
+        TaUser userElement = getTaUser(request);
+        responseBean = iBuildingOwnerInfoService.deleteIds(ids, userElement.getUserId());
         return responseBean;
     }
 
@@ -163,10 +163,10 @@ public class BuildingOwnerInfoController extends BaseController {
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/building/phase",method = RequestMethod.GET)
-    public ResponseBean getPhaseList(HttpSession session){
+    public ResponseBean getPhaseList(HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.getPhaseList(userElement.getCommunityId());
+        TaUser userElement = getTaUser(request);
+        responseBean = iBuildingOwnerInfoService.getPhaseList(userElement.getOrgId());
         return responseBean;
     }
     
@@ -175,10 +175,10 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "query", name = "phaseId",value = "期区ID")
     })
     @RequestMapping(value = "/building/building",method = RequestMethod.GET)
-    public ResponseBean getBuildingList(@RequestParam Integer phaseId, HttpSession session){
+    public ResponseBean getBuildingList(@RequestParam Integer phaseId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.getBuildingList(phaseId,userElement.getCommunityId());
+        TaUser userElement = getTaUser(request);
+        responseBean = iBuildingOwnerInfoService.getBuildingList(phaseId,userElement.getOrgId());
         return responseBean;
     }
     
@@ -187,10 +187,10 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "query", name = "buildingId",value = "楼栋ID")
     })
     @RequestMapping(value = "/building/unit",method = RequestMethod.GET)
-    public ResponseBean getUnitList(@RequestParam Integer buildingId, HttpSession session){
+    public ResponseBean getUnitList(@RequestParam Integer buildingId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.getUnitList(buildingId,userElement.getCommunityId());
+        TaUser userElement = getTaUser(request);
+        responseBean = iBuildingOwnerInfoService.getUnitList(buildingId,userElement.getOrgId());
         return responseBean;
     }
     
@@ -199,10 +199,10 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "query", name = "unitId",value = "单元ID")
     })
     @RequestMapping(value = "/building/level",method = RequestMethod.GET)
-    public ResponseBean getLevelList(@RequestParam Integer unitId, HttpSession session){
+    public ResponseBean getLevelList(@RequestParam Integer unitId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.getLevelList(unitId,userElement.getCommunityId());
+        TaUser userElement = getTaUser(request);
+        responseBean = iBuildingOwnerInfoService.getLevelList(unitId,userElement.getOrgId());
         return responseBean;
     }
     
@@ -211,10 +211,10 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "query", name = "levelId",value = "楼层ID")
     })
     @RequestMapping(value = "/building/roomno",method = RequestMethod.GET)
-    public ResponseBean getRoomNoList(@RequestParam Integer levelId, HttpSession session){
+    public ResponseBean getRoomNoList(@RequestParam Integer levelId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.getRoomNoList(levelId,userElement.getCommunityId());
+        TaUser userElement = getTaUser(request);
+        responseBean = iBuildingOwnerInfoService.getRoomNoList(levelId,userElement.getOrgId());
         return responseBean;
     }
     
@@ -228,9 +228,9 @@ public class BuildingOwnerInfoController extends BaseController {
  
     @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
     @PostMapping(value = "/building/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
+    public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         try {
             responseBean = iBuildingOwnerInfoService.submitExcelData(file,userElement);
         }catch (Exception e){
@@ -246,9 +246,9 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="ownerName:姓名,ownerTel:手机号 ,current:每页显示多少条,current:每页显示多少条,pageSzie:当前页数")})
 
     @RequestMapping(value="/userPassCertification",method = RequestMethod.POST)
-    public ResponseBean userPassCertification(@RequestBody String paramets, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean allApprove=iBuildingOwnerInfoService.selectUserApprove(paramets,userElement.getCommunityId());
+    public ResponseBean userPassCertification(@RequestBody String paramets, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean allApprove=iBuildingOwnerInfoService.selectUserApprove(paramets,userElement.getOrgId());
         return allApprove;
     }
 
@@ -267,8 +267,8 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="phase:期,building:楼栋 ,unit:单元,level:楼层，roomNo:户号， pageNum:每页显示多少条,pageSzie:当前页数"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")})
     @RequestMapping(value="/buildinglist",method = RequestMethod.POST)
-    public ResponseBean buildinglist(@RequestBody String paramets, HttpSession session){
-        UserElement userElement = getUserElement(session);
+    public ResponseBean buildinglist(@RequestBody String paramets, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
         ResponseBean buildinglist=iBuildingOwnerInfoService.buildinglist(paramets,userElement);
         return buildinglist;
     }
@@ -279,9 +279,9 @@ public class BuildingOwnerInfoController extends BaseController {
                     "unit单元;level楼层：roomNo:户号") // ;roomNo户号
     })
     @RequestMapping(value = "/buildinghouse",method = RequestMethod.POST)
-    public ResponseBean puildinghouse(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean responseBean = iBuildingOwnerInfoService.puildinghouse(parameter, userElement.getCommunityId());
+    public ResponseBean puildinghouse(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean responseBean = iBuildingOwnerInfoService.puildinghouse(parameter, userElement.getOrgId());
         return responseBean;
     }
 
@@ -291,9 +291,9 @@ public class BuildingOwnerInfoController extends BaseController {
                     "unit:当前楼层单元;level:当前楼层楼层;roomNo:当前楼层楼层")
     })
     @RequestMapping(value = "/communitybuilding/update",method = RequestMethod.POST)
-    public ResponseBean communitybuildingAdd(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean responseBean = iBuildingOwnerInfoService.communitybuildingUpdate(parameter, userElement.getCommunityId());
+    public ResponseBean communitybuildingAdd(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean responseBean = iBuildingOwnerInfoService.communitybuildingUpdate(parameter, userElement.getOrgId());
         return responseBean;
     }
 
@@ -303,8 +303,8 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/building/downloadExcel", method = RequestMethod.GET)
-    public void exportExcel(HttpServletResponse response, HttpSession session) {
-        UserElement userElement = getUserElement(session);
+    public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
+        TaUser userElement = getTaUser(request);
         XSSFWorkbook workbook = (XSSFWorkbook) iBuildingOwnerInfoService.downloadExcel(userElement).getData();
         this.setResponseHeader(response, "业主资料库.xlsx");
         //响应到客户端
@@ -322,8 +322,8 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:楼栋住户ID"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")})
     @RequestMapping(value="/building/details",method = RequestMethod.POST)
-    public ResponseBean buildingDetails(@RequestBody String paramets, HttpSession session){
-        UserElement userElement = getUserElement(session);
+    public ResponseBean buildingDetails(@RequestBody String paramets, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
         ResponseBean buildinglist=iBuildingOwnerInfoService.buildingDetails(paramets,userElement);
         return buildinglist;
     }

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

@@ -1,8 +1,9 @@
 package com.huiju.estateagents.property.controller;
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.BuildingTreeServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -20,7 +22,7 @@ import javax.servlet.http.HttpSession;
  */
 @RestController
 
-@RequestMapping("/")
+@RequestMapping("/api")
 @Api(value = "楼栋树管理", description = "楼栋树管理 Api")
 public class BuildingTreeController extends BaseController {
 	
@@ -37,24 +39,24 @@ public class BuildingTreeController extends BaseController {
 	
 	@ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
 	@PostMapping(value = "/tree/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-	public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
+	public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = buildingTreeService.submitExcelData(file,userElement);
 		return responseBean;
 	}
 	
 	@ApiOperation(value = "获取树形数据", notes = "获取树形数据")
-	@GetMapping(value = "/trees")
+	@GetMapping(value = "/admin/buildingInfo/trees")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "authorization", value = "Token"),
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "id", value = "当前节点id(查期时ID为空)"),
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "treeType", value = "phase:(期)，building:(栋),unit:(单元),level:(楼层),roomNo:(房间号)")
 	})
-	public ResponseBean getTreeList(@RequestParam(value = "id", required = false) Integer id, @RequestParam("treeType") String treeType, HttpSession session){
-		ResponseBean responseBean = new ResponseBean();UserElement userElement = getUserElement(session);
-
-		responseBean = buildingTreeService.getTreeList(userElement.getCommunityId(),id,treeType);
+	public ResponseBean getTreeList(@RequestParam(value = "id", required = false) Integer id, @RequestParam("treeType") String treeType, HttpServletRequest request){
+		ResponseBean responseBean = new ResponseBean();
+		TaUser userElement = getTaUser(request);
+		responseBean = buildingTreeService.getTreeList(userElement.getOrgId(),id,treeType);
 		return responseBean;
 	}
 
@@ -64,9 +66,9 @@ public class BuildingTreeController extends BaseController {
 					"name:节点名称;type：(phase:(期)，building:(栋),unit:(单元),level:(楼层),roomNo:(房间号)), roomNonodeNumber:输入的节点")
 	})
 	@RequestMapping(value = "/addnode",method = RequestMethod.POST)
-	public ResponseBean addNode(@RequestBody String parameter, HttpSession session){
-		UserElement userElement = getUserElement(session);
-	    ResponseBean	responseBean = buildingTreeService.addNode(parameter, userElement.getCommunityId());
+	public ResponseBean addNode(@RequestBody String parameter, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
+	    ResponseBean	responseBean = buildingTreeService.addNode(parameter, userElement.getOrgId());
 		return responseBean;
 	}
 
@@ -75,9 +77,9 @@ public class BuildingTreeController extends BaseController {
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id:当前节点;type:(end:(房间)，roomNo:(楼层),level:(单元)，unit:(楼栋),building:(期))")
 	})
 	@RequestMapping(value = "/deletenode",method = RequestMethod.POST)
-	public ResponseBean deletenode(@RequestBody String parameter, HttpSession session){
-		UserElement userElement = getUserElement(session);
-		ResponseBean	responseBean = buildingTreeService.deleteNode(parameter, userElement.getCommunityId());
+	public ResponseBean deletenode(@RequestBody String parameter, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
+		ResponseBean	responseBean = buildingTreeService.deleteNode(parameter, userElement.getOrgId());
 		return responseBean;
 	}
 }

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

@@ -3,9 +3,10 @@ package com.huiju.estateagents.property.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.TpCarouselSetting;
 import com.huiju.estateagents.property.service.ICarouselSettingService;
 import io.swagger.annotations.Api;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.HashMap;
 import java.util.Map;
@@ -44,11 +46,11 @@ public class CarouselSettingController extends BaseController {
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "parameter", value = "carouselNum数量值")
     })
     @RequestMapping(value = "/carousel/announcement/banner", method = RequestMethod.PUT)
-    public ResponseBean updateAnnouncementBanner(@RequestBody String parameter, HttpSession session) {
+    public ResponseBean updateAnnouncementBanner(@RequestBody String parameter, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         QueryWrapper<TpCarouselSetting> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("community_id", userElement.getCommunityId());
+        queryWrapper.eq("community_id", userElement.getOrgId());
         queryWrapper.eq("carousel_type","announcement");
         TpCarouselSetting one = iCarouselSettingService.getOne(queryWrapper);
         Integer carouselNum = JSONObject.parseObject(parameter).getInteger("carouselNum");
@@ -61,7 +63,7 @@ public class CarouselSettingController extends BaseController {
             one = new TpCarouselSetting();
             one.setCarouselNum(carouselNum);
             one.setCarouselType("announcement");
-            one.setCommunityId(userElement.getCommunityId());
+            one.setCommunityId(userElement.getOrgId());
             // 添加
             b = iCarouselSettingService.save(one);
 
@@ -81,11 +83,11 @@ public class CarouselSettingController extends BaseController {
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "parameter", value = "carouselNum数量值")
     })
     @RequestMapping(value = "/carousel/activity/banner", method = RequestMethod.PUT)
-    public ResponseBean updateActivityBanner(@RequestBody String parameter, HttpSession session) {
+    public ResponseBean updateActivityBanner(@RequestBody String parameter, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         QueryWrapper<TpCarouselSetting> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("community_id", userElement.getCommunityId());
+        queryWrapper.eq("community_id", userElement.getOrgId());
         queryWrapper.eq("carousel_type","activity");
         TpCarouselSetting one = iCarouselSettingService.getOne(queryWrapper);
         Integer carouselNum = JSONObject.parseObject(parameter).getInteger("carouselNum");
@@ -96,7 +98,7 @@ public class CarouselSettingController extends BaseController {
         } else {
             one = new TpCarouselSetting();
             one.setCarouselType("activity");
-            one.setCommunityId(userElement.getCommunityId());
+            one.setCommunityId(userElement.getOrgId());
             one.setCarouselNum(carouselNum);
             b = iCarouselSettingService.save(one);
         }
@@ -115,16 +117,16 @@ public class CarouselSettingController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
     })
     @RequestMapping(value = "/carousel/getBanner", method = RequestMethod.GET)
-    public ResponseBean getBannerNum(HttpSession session) {
+    public ResponseBean getBannerNum(HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         QueryWrapper<TpCarouselSetting> activityQueryWrapper = new QueryWrapper<>();
-        activityQueryWrapper.eq("community_id", userElement.getCommunityId());
+        activityQueryWrapper.eq("community_id", userElement.getOrgId());
         activityQueryWrapper.eq("carousel_type","activity");
         TpCarouselSetting activityOne = iCarouselSettingService.getOne(activityQueryWrapper);
 
         QueryWrapper<TpCarouselSetting> announcementQueryWrapper = new QueryWrapper<>();
-        announcementQueryWrapper.eq("community_id", userElement.getCommunityId());
+        announcementQueryWrapper.eq("community_id", userElement.getOrgId());
         announcementQueryWrapper.eq("carousel_type","announcement");
         TpCarouselSetting announcementOne = iCarouselSettingService.getOne(announcementQueryWrapper);
 

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

@@ -2,8 +2,8 @@ package com.huiju.estateagents.property.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.IUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -2,9 +2,10 @@ package com.huiju.estateagents.property.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.Hotel;
 import com.huiju.estateagents.property.model.HotelRoom;
 import com.huiju.estateagents.property.service.IHotelRoomService;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -52,9 +54,9 @@ public class HotelController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/hotelRoomList", method = RequestMethod.POST)
-    public ResponseBean hotelRoom(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = iHotelService.hotelRoomLiset(parameter,userElement.getCommunityId());
+    public ResponseBean hotelRoom(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = iHotelService.hotelRoomLiset(parameter,userElement.getOrgId());
         return responseBean;
     }
 
@@ -69,8 +71,8 @@ public class HotelController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/hotelRoomAdd", method = RequestMethod.POST)
-    public ResponseBean hotelRoomAdd(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
+    public ResponseBean hotelRoomAdd(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
         ResponseBean  responseBean = iHotelService.hotelRoomAdd(parameter,userElement);
         return responseBean;
     }
@@ -80,8 +82,8 @@ public class HotelController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:房间ID")})
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/getRoom", method = RequestMethod.POST)
-    public ResponseBean getRoom(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
+    public ResponseBean getRoom(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
         ResponseBean responseBean= new ResponseBean<>();
 
        JSONObject object= JSONObject.parseObject(parameter);
@@ -101,8 +103,8 @@ public class HotelController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/hotelRoomEdit", method = RequestMethod.POST)
-    public ResponseBean hotelRoomEdit(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
+    public ResponseBean hotelRoomEdit(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
         ResponseBean  responseBean = iHotelService.hotelRoomEdit(parameter,userElement);
         return responseBean;
     }
@@ -113,8 +115,8 @@ public class HotelController extends BaseController {
             )})
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/hotelRoomRoomStatus", method = RequestMethod.POST)
-    public ResponseBean hotelRoomRoomStatus(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
+    public ResponseBean hotelRoomRoomStatus(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
         ResponseBean  responseBean = iHotelService.hotelRoomRoomStatus(parameter,userElement);
         return responseBean;
     }
@@ -124,9 +126,9 @@ public class HotelController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
     })
     @RequestMapping(value = "/getHotelData",method = RequestMethod.GET)
-    public ResponseBean getHotelData(HttpSession session) {
+    public ResponseBean getHotelData(HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         Hotel hotel = iHotelService.getHotelData(userElement);
         responseBean.addSuccess(hotel);
         return responseBean;
@@ -139,8 +141,8 @@ public class HotelController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/addHotel", method = RequestMethod.POST)
-    public ResponseBean addHotel(@RequestBody Hotel hotel, HttpSession session){
-        UserElement userElement = getUserElement(session);
+    public ResponseBean addHotel(@RequestBody Hotel hotel, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
         ResponseBean  responseBean = iHotelService.addHotel(hotel,userElement);
         return responseBean;
     }

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
 
-import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.base.BaseController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.ImageServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,8 +1,9 @@
 package com.huiju.estateagents.property.controller;
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.IndexCountServiceI;
 import com.google.common.collect.Maps;
 import io.swagger.annotations.ApiImplicitParam;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.Map;
 
@@ -32,8 +34,8 @@ public class IndexCountController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/index/count", method = RequestMethod.GET)
-	public ResponseBean getIndexCount(HttpSession session){
-		UserElement userElement = getUserElement(session);
+	public ResponseBean getIndexCount(HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
 		ResponseBean  responseBean = new ResponseBean();
 		Map<String,Object> indexCountMap = Maps.newHashMap();
 		try {

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

@@ -1,9 +1,10 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.IMessageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -38,9 +40,9 @@ public class MessageController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/messageLiset", method = RequestMethod.POST)
-    public ResponseBean messageLiset(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = messageService.messageLiset(parameter,userElement.getCommunityId(),userElement.getId());
+    public ResponseBean messageLiset(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = messageService.messageLiset(parameter,userElement.getOrgId(),userElement.getUserId());
         return responseBean;
     }
 
@@ -50,9 +52,9 @@ public class MessageController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/myMessageList", method = RequestMethod.POST)
-    public ResponseBean myMessageList(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = messageService.myMessageList(parameter,userElement.getCommunityId(),userElement.getId());
+    public ResponseBean myMessageList(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = messageService.myMessageList(parameter,userElement.getOrgId(),userElement.getUserId());
         return responseBean;
     }
 
@@ -62,9 +64,9 @@ public class MessageController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/delectRead", method = RequestMethod.POST)
-    public ResponseBean delectRead(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = messageService.delectRead(parameter,userElement.getId());
+    public ResponseBean delectRead(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = messageService.delectRead(parameter,userElement.getUserId());
         return responseBean;
     }
 }

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

@@ -1,8 +1,9 @@
 package com.huiju.estateagents.property.controller;
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.SysRole;
 import com.huiju.estateagents.property.service.RoleServiceI;
 import io.swagger.annotations.Api;
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -38,9 +40,9 @@ public class RoleController extends BaseController {
 	public ResponseBean getRoleList(@RequestParam(value = "roleName", required = false) String roleName,
 	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 	                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-	                            HttpSession session) {
+	                            HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = roleService.getRoleList(roleName,userElement,pageNum,pageSize);
 		return responseBean;
 	}
@@ -52,9 +54,9 @@ public class RoleController extends BaseController {
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
 	})
 	@RequestMapping(value = "/role/add", method = RequestMethod.POST)
-	public ResponseBean addRole(@RequestBody SysRole sysRole, HttpSession session) {
+	public ResponseBean addRole(@RequestBody SysRole sysRole, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = roleService.addRole(sysRole, userElement);
 		return responseBean;
 	}
@@ -68,9 +70,9 @@ public class RoleController extends BaseController {
 	})
 	@RequestMapping(value = "/role/{id}",method = RequestMethod.GET)
 	public ResponseBean getRoleInfo(@PathVariable(value = "id", required = false) Integer id,
-	                            HttpSession session) {
+	                            HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = roleService.getRoleInfo(id,userElement);
 		return responseBean;
 	}
@@ -83,9 +85,9 @@ public class RoleController extends BaseController {
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
 	})
 	@RequestMapping(value = "/role/update/{id}", method = RequestMethod.PUT)
-	public ResponseBean updateRole(@PathVariable Integer id, @RequestBody SysRole sysRole, HttpSession session) {
+	public ResponseBean updateRole(@PathVariable Integer id, @RequestBody SysRole sysRole, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		sysRole.setId(id);
 		responseBean = roleService.updateRole(sysRole, userElement);
 		return responseBean;
@@ -98,9 +100,9 @@ public class RoleController extends BaseController {
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "idArray角色id集合")
 	})
 	@RequestMapping(value = "/role/delete", method = RequestMethod.POST)
-	public ResponseBean deleteRole(@RequestBody SysRole sysRole, HttpSession session) {
+	public ResponseBean deleteRole(@RequestBody SysRole sysRole, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = roleService.deleteRole(sysRole, userElement);
 		return responseBean;
 	}

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
 
-import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.base.BaseController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.TaTemporaryLicenseCount;
 import com.huiju.estateagents.property.service.ITaTemporaryLicenseCountService;
 import org.slf4j.Logger;

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.TaUserLicenseCount;
 import com.huiju.estateagents.property.service.ITaUserLicenseCountService;
 import org.slf4j.Logger;

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

@@ -1,9 +1,10 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.ITaUserLicenseOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -55,9 +56,9 @@ public class TaUserLicenseOrderController extends BaseController {
                                @RequestParam(value = "paymentTel",required = false) String paymentTel,
                                @RequestParam(value = "pageNum",defaultValue = "1", required = false) Integer pageNum,
                                @RequestParam(value = "pageSize" ,defaultValue = "10", required = false) Integer pageSize,
-                               HttpSession session) {
+                               HttpServletRequest request) {
 
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         ResponseBean responseBean = iTaUserLicenseOrderService.getAll(id, licensePlate, orderNumber, paymentName, paymentTel, pageNum, pageSize, userElement);
         return responseBean;
     }
@@ -68,8 +69,8 @@ public class TaUserLicenseOrderController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/user/license/export", method = RequestMethod.GET)
-    public void exportDate(HttpServletRequest request, HttpServletResponse response, HttpSession session) {
-        UserElement userElement = getUserElement(session);
+    public void exportDate(HttpServletRequest request, HttpServletResponse response) {
+        TaUser userElement = getTaUser(request);
         ResponseBean responseBean = iTaUserLicenseOrderService.exportDate(userElement);
         Workbook workbook = (Workbook) responseBean.getData();
         this.setResponseHeader(response, "月租租车.xlsx");

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

@@ -1,9 +1,10 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.ITaVisitorLicenseSettingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -39,9 +41,9 @@ public class TaVisitorLicenseSettingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/visitor/saveOrDelete", method = RequestMethod.POST)
-    public ResponseBean saveOrDelete(HttpSession session, @RequestParam("visitorLicenseBool") Boolean visitorLicenseBool){
+    public ResponseBean saveOrDelete(HttpServletRequest request, @RequestParam("visitorLicenseBool") Boolean visitorLicenseBool){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = taVisitorLicenseSettingService.saveOrDelete(userElement, visitorLicenseBool);
 
         return responseBean;
@@ -53,9 +55,9 @@ public class TaVisitorLicenseSettingController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/visitor", method = RequestMethod.GET)
-    public ResponseBean getVisitorLicense(HttpSession session) {
+    public ResponseBean getVisitorLicense(HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = taVisitorLicenseSettingService.getVisitorLicense(userElement);
         return responseBean;
     }

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

@@ -1,8 +1,9 @@
 package com.huiju.estateagents.property.controller;
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.TpAnnouncementService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 @RestController
@@ -29,9 +31,9 @@ public class TpAnnouncementController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告编号,announcementTitle:公告标题 ,current:每页显示多少条,current:每页显示多少条,pageSzie:当前页数")})
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value="/tpAnnouncement",method = RequestMethod.POST)
-    public ResponseBean tpAnnouncement(@RequestBody String paramets, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean tpAnnouncementList=tpAnnouncementService.tpAnnouncemenList(paramets,userElement.getCommunityId());
+    public ResponseBean tpAnnouncement(@RequestBody String paramets, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean tpAnnouncementList=tpAnnouncementService.tpAnnouncemenList(paramets,userElement.getOrgId());
         return tpAnnouncementList;
     }
 
@@ -41,9 +43,9 @@ public class TpAnnouncementController extends BaseController {
                     "announcementCarouselImg:轮播图，announcementContent：内容，contentImg:内容图片，sort:权重值,status:'0 是已作废 1 是已发布   2 是草稿 3 是已修改',")})
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value="/addAnnouncement",method = RequestMethod.POST)
-    public ResponseBean addAnnouncement(@RequestBody String paramets, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  addAnnouncement= tpAnnouncementService.addAnnouncement(paramets,userElement.getCommunityId(),userElement.getId());
+    public ResponseBean addAnnouncement(@RequestBody String paramets, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  addAnnouncement= tpAnnouncementService.addAnnouncement(paramets,userElement.getOrgId(),userElement.getUserId());
         return addAnnouncement;
     }
 
@@ -61,9 +63,9 @@ public class TpAnnouncementController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告id，announcementTitle:公告标题，" +
                     "announcementCarouselImg:轮播图，announcementContent：内容，contentImg:内容图片，sort:权重值,status:'0 是已作废 1 是已发布   2 是草稿 3 是已修改',")})
     @RequestMapping(value="/updateAnnouncement",method = RequestMethod.POST)
-    public ResponseBean updateAnnouncement(@RequestBody String paramets, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean tpAnnouncement= tpAnnouncementService.updateAnnouncement(paramets,userElement.getCommunityId(),userElement.getId());
+    public ResponseBean updateAnnouncement(@RequestBody String paramets, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean tpAnnouncement= tpAnnouncementService.updateAnnouncement(paramets,userElement.getOrgId(),userElement.getUserId());
         return tpAnnouncement;
     }
 
@@ -71,9 +73,9 @@ public class TpAnnouncementController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告id(多个)")})
     @RequestMapping(value="/deleteAnnouncement",method = RequestMethod.POST)
-    public ResponseBean deleteAnnouncement(@RequestBody String paramets, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean tpAnnouncement= tpAnnouncementService.deleteAnnouncement(paramets,userElement.getCommunityId(),userElement.getId());
+    public ResponseBean deleteAnnouncement(@RequestBody String paramets, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean tpAnnouncement= tpAnnouncementService.deleteAnnouncement(paramets,userElement.getOrgId(),userElement.getUserId());
         return tpAnnouncement;
     }
 

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.TpBillInvoiceCount;
 import com.huiju.estateagents.property.service.ITpBillInvoiceCountService;
 import org.slf4j.Logger;

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
 
-import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.base.BaseController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -1,9 +1,10 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.ITpEquipmentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.List;
 
@@ -37,9 +39,9 @@ public class TpEquipmentController extends BaseController {
         @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "type", value = "1 监控 2 访客机 3 可是对讲"),
         @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
-    public ResponseBean getAll(@RequestParam("type") Integer type, HttpSession session) {
+    public ResponseBean getAll(@RequestParam("type") Integer type, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iTpEquipmentService.getAllByCommunityAndEquipmentType(userElement, type);
         return responseBean;
     }
@@ -51,9 +53,9 @@ public class TpEquipmentController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataTypeClass = Integer.class, name = "parameter", value = "监控设备数据"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
-    public ResponseBean saveOrUpdateMonitoring(@RequestBody String parameter, HttpSession session) {
+    public ResponseBean saveOrUpdateMonitoring(@RequestBody String parameter, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iTpEquipmentService.saveOrUpdateMonitoring(parameter, userElement);
         return responseBean;
     }
@@ -64,7 +66,7 @@ public class TpEquipmentController extends BaseController {
             @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "设备id"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
-    public ResponseBean deleteEquipmentById(@PathVariable("id") Integer id, HttpSession session){
+    public ResponseBean deleteEquipmentById(@PathVariable("id") Integer id, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         responseBean = iTpEquipmentService.deleteEquipmentById(id);
         return responseBean;
@@ -76,7 +78,7 @@ public class TpEquipmentController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataTypeClass = Integer.class, name = "ids", value = "设备id"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
-    public ResponseBean deleteBachEquipmentById(@RequestBody List<Integer> ids, HttpSession session){
+    public ResponseBean deleteBachEquipmentById(@RequestBody List<Integer> ids, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         responseBean = iTpEquipmentService.deleteBachEquipmentById(ids);
         return responseBean;
@@ -90,9 +92,9 @@ public class TpEquipmentController extends BaseController {
             @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "设备id"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
-    public ResponseBean getMonitoringById(@RequestParam("type") Integer type, @PathVariable("id") Integer id, HttpSession session) {
+    public ResponseBean getMonitoringById(@RequestParam("type") Integer type, @PathVariable("id") Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iTpEquipmentService.getMonitoringById(userElement, type, id);
         return responseBean;
     }

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
 
-import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.base.BaseController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
 
-import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.base.BaseController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -3,9 +3,10 @@ package com.huiju.estateagents.property.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.TpRentalHouse;
 import com.huiju.estateagents.property.service.ITpRentalHouseService;
 import io.swagger.annotations.Api;
@@ -15,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -60,9 +62,9 @@ public class TpRentalHouseController extends BaseController {
 	                                @RequestParam(value = "houseStatus") String houseStatus,
 	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 	                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-	                                HttpSession session) {
+	                                HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = tpRentalHouseService.getRentalList(id,houseName,startPrice,endPrice,rentalType,houseType,houseStatus,userElement,pageNum,pageSize);
 		return responseBean;
 	}
@@ -73,9 +75,9 @@ public class TpRentalHouseController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/rental/add",method = RequestMethod.POST)
-	public ResponseBean saveRental(@RequestBody TpRentalHouse rentalHouse, HttpSession session){
+	public ResponseBean saveRental(@RequestBody TpRentalHouse rentalHouse, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = tpRentalHouseService.saveRental(rentalHouse,userElement);
 		return responseBean;
 	}
@@ -86,9 +88,9 @@ public class TpRentalHouseController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/rental/update",method = RequestMethod.POST)
-	public ResponseBean updateRental(@RequestBody TpRentalHouse rentalHouse, HttpSession session){
+	public ResponseBean updateRental(@RequestBody TpRentalHouse rentalHouse, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = tpRentalHouseService.updateRental(rentalHouse,userElement);
 		return responseBean;
 	}
@@ -99,9 +101,9 @@ public class TpRentalHouseController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/rental/get/{id}",method = RequestMethod.GET)
-	public ResponseBean getRental(@PathVariable Integer id, HttpSession session){
+	public ResponseBean getRental(@PathVariable Integer id, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		TpRentalHouse rentalHouse = tpRentalHouseService.getRentalById(id);
 		responseBean.addSuccess(rentalHouse);
 		return responseBean;
@@ -113,9 +115,9 @@ public class TpRentalHouseController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/rental/shelf",method = RequestMethod.POST)
-	public ResponseBean shelfRental(@RequestBody String jsonString, HttpSession session){
+	public ResponseBean shelfRental(@RequestBody String jsonString, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		JSONObject jsonObject = JSONObject.parseObject(jsonString);
 		JSONArray ids = jsonObject.getJSONArray("idArray");
 		List<TpRentalHouse> rentalList = new ArrayList<>();
@@ -123,7 +125,7 @@ public class TpRentalHouseController extends BaseController {
 			TpRentalHouse rentalHouse = new TpRentalHouse();
 			rentalHouse.setId((Integer) id);
 			rentalHouse.setHouseStatus("1");
-			rentalHouse.setUpdateUser(userElement.getId());
+			rentalHouse.setUpdateUser(userElement.getUserId());
 			rentalHouse.setUpdateDate(LocalDateTime.now());
 			rentalList.add(rentalHouse);
 		}
@@ -143,9 +145,9 @@ public class TpRentalHouseController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/rental/obtained",method = RequestMethod.POST)
-	public ResponseBean obtainedRental(@RequestBody String jsonString, HttpSession session){
+	public ResponseBean obtainedRental(@RequestBody String jsonString, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		JSONObject jsonObject = JSONObject.parseObject(jsonString);
 		JSONArray ids = jsonObject.getJSONArray("idArray");
 		List<TpRentalHouse> rentalList = new ArrayList<>();
@@ -153,7 +155,7 @@ public class TpRentalHouseController extends BaseController {
 			TpRentalHouse rentalHouse = new TpRentalHouse();
 			rentalHouse.setId((Integer) id);
 			rentalHouse.setHouseStatus("2");
-			rentalHouse.setUpdateUser(userElement.getId());
+			rentalHouse.setUpdateUser(userElement.getUserId());
 			rentalHouse.setUpdateDate(LocalDateTime.now());
 			rentalList.add(rentalHouse);
 		}

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
 
-import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.base.BaseController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -3,9 +3,10 @@ package com.huiju.estateagents.property.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.TpShop;
 import com.huiju.estateagents.property.service.ITpShopService;
 import io.swagger.annotations.Api;
@@ -15,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -54,9 +56,9 @@ public class TpShopController extends BaseController {
 	                                @RequestParam(value = "shopStatus") String shopStatus,
 	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 	                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-	                                HttpSession session) {
+	                                HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = shopService.getShopList(id,shopName,shopTypeId,shopStatus,userElement,pageNum,pageSize);
 		return responseBean;
 	}
@@ -67,9 +69,9 @@ public class TpShopController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/shop/add",method = RequestMethod.POST)
-	public ResponseBean saveShop(@RequestBody TpShop shop, HttpSession session){
+	public ResponseBean saveShop(@RequestBody TpShop shop, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = shopService.saveShop(shop,userElement);
 		return responseBean;
 	}
@@ -80,9 +82,9 @@ public class TpShopController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/shop/get/{id}",method = RequestMethod.GET)
-	public ResponseBean getShop(@PathVariable Integer id, HttpSession session){
+	public ResponseBean getShop(@PathVariable Integer id, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		TpShop tpShop = shopService.getShopById(id);
 		responseBean.addSuccess(tpShop);
 		return responseBean;
@@ -94,9 +96,9 @@ public class TpShopController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/shop/update",method = RequestMethod.POST)
-	public ResponseBean updateShop(@RequestBody TpShop shop, HttpSession session){
+	public ResponseBean updateShop(@RequestBody TpShop shop, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = shopService.updateShop(shop,userElement);
 		return responseBean;
 	}
@@ -107,9 +109,9 @@ public class TpShopController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/shop/shelf",method = RequestMethod.POST)
-	public ResponseBean shelfShop(@RequestBody String jsonString, HttpSession session){
+	public ResponseBean shelfShop(@RequestBody String jsonString, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		JSONObject jsonObject = JSONObject.parseObject(jsonString);
 		JSONArray ids = jsonObject.getJSONArray("idArray");
 		List<TpShop> tpShopList = new ArrayList<>();
@@ -117,7 +119,7 @@ public class TpShopController extends BaseController {
 			TpShop tpShop = new TpShop();
 			tpShop.setId((Integer) id);
 			tpShop.setShopStatus("1");
-			tpShop.setUpdateUser(userElement.getId());
+			tpShop.setUpdateUser(userElement.getUserId());
 			tpShop.setUpdateDate(LocalDateTime.now());
 			tpShopList.add(tpShop);
 		}
@@ -137,9 +139,9 @@ public class TpShopController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/shop/obtained",method = RequestMethod.POST)
-	public ResponseBean obtainedShop(@RequestBody String jsonString, HttpSession session){
+	public ResponseBean obtainedShop(@RequestBody String jsonString, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		JSONObject jsonObject = JSONObject.parseObject(jsonString);
 		JSONArray ids = jsonObject.getJSONArray("idArray");
 		List<TpShop> tpShopList = new ArrayList<>();
@@ -147,7 +149,7 @@ public class TpShopController extends BaseController {
 			TpShop tpShop = new TpShop();
 			tpShop.setId((Integer) id);
 			tpShop.setShopStatus("2");
-			tpShop.setUpdateUser(userElement.getId());
+			tpShop.setUpdateUser(userElement.getUserId());
 			tpShop.setUpdateDate(LocalDateTime.now());
 			tpShopList.add(tpShop);
 		}

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
 
-import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.base.BaseController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -1,9 +1,10 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.ITpShopSettingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -40,9 +42,9 @@ public class TpShopSettingController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/shop/add/setting",method = RequestMethod.POST)
-	public ResponseBean changeShopSetting(@RequestBody String jsonString, HttpSession session){
+	public ResponseBean changeShopSetting(@RequestBody String jsonString, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = shopSettingService.changeShopSetting(userElement,jsonString);
 		return responseBean;
 	}

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

@@ -2,9 +2,10 @@ package com.huiju.estateagents.property.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.model.TpShopType;
 import com.huiju.estateagents.property.service.ITpShopTypeService;
 import io.swagger.annotations.Api;
@@ -14,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -43,10 +45,10 @@ public class TpShopTypeController extends BaseController {
 	})
 	@RequestMapping(value = "/shop/types",method = RequestMethod.GET)
 	public ResponseBean getTypesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
-		responseBean = shopTypeService.getTypesList(userElement.getCommunityId(),pageNum,pageSize);
+		TaUser userElement = getTaUser(request);
+		responseBean = shopTypeService.getTypesList(userElement.getOrgId(),pageNum,pageSize);
 		return responseBean;
 	}
 	
@@ -56,12 +58,12 @@ public class TpShopTypeController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/shop/add/type",method = RequestMethod.POST)
-	public ResponseBean saveShopType(@RequestBody TpShopType shopType, HttpSession session){
+	public ResponseBean saveShopType(@RequestBody TpShopType shopType, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
-		shopType.setCommunityId(userElement.getCommunityId());
+		TaUser userElement = getTaUser(request);
+		shopType.setCommunityId(userElement.getOrgId());
 		shopType.setSource("self");
-		shopType.setCreateUser(userElement.getId());
+		shopType.setCreateUser(userElement.getUserId());
 		shopType.setCreateDate(LocalDateTime.now());
 		//查看索引是否存在
 		QueryWrapper<TpShopType> shopTypeQueryWrapper = new QueryWrapper<>();
@@ -87,9 +89,9 @@ public class TpShopTypeController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/shop/get/type/{id}",method = RequestMethod.GET)
-	public ResponseBean getShopType(@PathVariable Integer id, HttpSession session){
+	public ResponseBean getShopType(@PathVariable Integer id, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		TpShopType tpShopType = shopTypeService.getById(id);
 		responseBean.addSuccess(tpShopType);
 		return responseBean;
@@ -101,12 +103,12 @@ public class TpShopTypeController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/shop/update/type",method = RequestMethod.POST)
-	public ResponseBean updateShopType(@RequestBody TpShopType shopType, HttpSession session){
+	public ResponseBean updateShopType(@RequestBody TpShopType shopType, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		//查看索引是否存在
 		QueryWrapper<TpShopType> shopTypeQueryWrapper = new QueryWrapper<>();
-		shopTypeQueryWrapper.eq("community_id",userElement.getCommunityId());
+		shopTypeQueryWrapper.eq("community_id",userElement.getOrgId());
 		shopTypeQueryWrapper.eq("sort",shopType.getSort());
 		shopTypeQueryWrapper.ne("id",shopType.getId());
 		List<TpShopType> list = shopTypeService.list(shopTypeQueryWrapper);
@@ -130,7 +132,7 @@ public class TpShopTypeController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/shop/delete/type",method = RequestMethod.DELETE)
-	public ResponseBean deleteShopType(@RequestBody String jsonString, HttpSession session){
+	public ResponseBean deleteShopType(@RequestBody String jsonString, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
 		responseBean = shopTypeService.deleteShopType(jsonString);
 		return responseBean;
@@ -144,11 +146,11 @@ public class TpShopTypeController extends BaseController {
 	})
 	@RequestMapping(value = "/shop/type/select",method = RequestMethod.GET)
 	public ResponseBean getTypesSelect(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		QueryWrapper<TpShopType> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("community_id",userElement.getCommunityId());
+		queryWrapper.eq("community_id",userElement.getOrgId());
 		queryWrapper.orderByAsc("sort");
 		queryWrapper.orderByAsc("create_date");
 		responseBean.addSuccess(shopTypeService.list(queryWrapper));

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

@@ -1,9 +1,10 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.IUserService;
 import com.huiju.estateagents.property.service.TpTicketService;
 import io.swagger.annotations.Api;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -45,9 +47,9 @@ public class TpTicketController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/ticketLiset", method = RequestMethod.POST)
-    public ResponseBean ticketLiset(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = tpTicketService.ticketLiset(parameter,userElement.getCommunityId());
+    public ResponseBean ticketLiset(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = tpTicketService.ticketLiset(parameter,userElement.getOrgId());
         return responseBean;
     }
 
@@ -57,9 +59,9 @@ public class TpTicketController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/ticketDetails", method = RequestMethod.POST)
-    public ResponseBean ticketDetails(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = tpTicketService.ticketDetails(parameter,userElement.getId(),userElement.getCommunityId());
+    public ResponseBean ticketDetails(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = tpTicketService.ticketDetails(parameter,userElement.getUserId(),userElement.getOrgId());
         return responseBean;
     }
     @ApiOperation(value = "添加工单对话", notes = "添加工单对话")
@@ -69,9 +71,9 @@ public class TpTicketController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/addRecordComment", method = RequestMethod.POST)
-    public ResponseBean addRecordComment(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = tpTicketService.addRecordComment(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName());
+    public ResponseBean addRecordComment(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = tpTicketService.addRecordComment(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName());
         return responseBean;
     }
     @ApiOperation(value = "工单受理分配", notes = "工单受理分配")
@@ -81,9 +83,9 @@ public class TpTicketController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/addRecord", method = RequestMethod.POST)
-    public ResponseBean addRecord(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = tpTicketService.addRecord(parameter,userElement.getId(),userElement.getCommunityId());
+    public ResponseBean addRecord(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = tpTicketService.addRecord(parameter,userElement.getUserId(),userElement.getOrgId());
         return responseBean;
     }
     @ApiOperation(value = "修改工单状态为拒绝处理", notes = "修改工单状态为拒绝处理")
@@ -92,9 +94,9 @@ public class TpTicketController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/updateTicketStatus", method = RequestMethod.POST)
-    public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName(),userElement.getLoginName());
+    public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getLoginName());
         return responseBean;
     }
 
@@ -104,9 +106,9 @@ public class TpTicketController extends BaseController {
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/updateTicket", method = RequestMethod.POST)
-    public ResponseBean updateTicket(@RequestBody String parameter, HttpSession session){
-        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName(),userElement.getLoginName());
+    public ResponseBean updateTicket(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getLoginName());
         return responseBean;
     }
 }

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

@@ -1,9 +1,10 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
 import com.huiju.estateagents.property.service.ITransactionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -39,9 +41,9 @@ public class TransactionController extends BaseController {
 	})
 	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
 	@RequestMapping(value = "/transactions",method = RequestMethod.POST)
-	public ResponseBean getList(@RequestBody String parameter, HttpSession session){
-		UserElement userElement = getUserElement(session);
-		ResponseBean responseBean = transactionService.getTransactionList(parameter,userElement.getCommunityId() );
+	public ResponseBean getList(@RequestBody String parameter, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
+		ResponseBean responseBean = transactionService.getTransactionList(parameter,userElement.getOrgId() );
 		return responseBean;
 	}
 	
@@ -52,9 +54,9 @@ public class TransactionController extends BaseController {
 			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "交易id")
 	})
 	@RequestMapping(value = "/transaction/{id}",method = RequestMethod.GET)
-	public ResponseBean getList(@PathVariable(value = "id") Integer id, HttpSession session){
+	public ResponseBean getList(@PathVariable(value = "id") Integer id, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		TaUser userElement = getTaUser(request);
 		responseBean = transactionService.getTransactionInfo(id);
 		return responseBean;
 	}
@@ -66,10 +68,10 @@ public class TransactionController extends BaseController {
 			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "交易id")
 	})
 	@RequestMapping(value = "/transaction/update/{id}",method = RequestMethod.POST)
-	public ResponseBean updateTransaction(@PathVariable(value = "id") Integer id, HttpSession session){
+	public ResponseBean updateTransaction(@PathVariable(value = "id") Integer id, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
-		responseBean = transactionService.updateTransactionById(id,userElement.getId());
+		TaUser userElement = getTaUser(request);
+		responseBean = transactionService.updateTransactionById(id,userElement.getUserId());
 		return responseBean;
 	}
 
@@ -79,8 +81,8 @@ public class TransactionController extends BaseController {
 					"type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})
 	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
 	@RequestMapping(value="/transactions/add",method = RequestMethod.POST)
-	public ResponseBean transactionsAdd(@RequestBody String paramets, HttpSession session){
-		UserElement userElement = getUserElement(session);
+	public ResponseBean transactionsAdd(@RequestBody String paramets, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
 		ResponseBean  addAnnouncement= transactionService.transactionsAdd(paramets,userElement);
 		return addAnnouncement;
 	}
@@ -91,9 +93,9 @@ public class TransactionController extends BaseController {
 					"type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})
 	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
 	@RequestMapping(value="/transactions/updata",method = RequestMethod.POST)
-	public ResponseBean transactionsUpdata(@RequestBody String paramets, HttpSession session){
-		UserElement userElement = getUserElement(session);
-		ResponseBean  transactionsUpdata= transactionService.transactionsUpdata(paramets,userElement.getCommunityId(),userElement.getId());
+	public ResponseBean transactionsUpdata(@RequestBody String paramets, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
+		ResponseBean  transactionsUpdata= transactionService.transactionsUpdata(paramets,userElement.getOrgId(),userElement.getUserId());
 		return transactionsUpdata;
 	}
 	@ApiOperation(value = "删除二手租赁",nickname ="删除二手租赁")
@@ -101,9 +103,9 @@ public class TransactionController extends BaseController {
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个)" )})
 	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
 	@RequestMapping(value="/transactions/delete",method = RequestMethod.POST)
-	public ResponseBean transactionsDelete(@RequestBody String paramets, HttpSession session){
-		UserElement userElement = getUserElement(session);
-		ResponseBean  transactionsUpdata= transactionService.transactionsDelete(paramets,userElement.getCommunityId(),userElement.getId());
+	public ResponseBean transactionsDelete(@RequestBody String paramets, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
+		ResponseBean  transactionsUpdata= transactionService.transactionsDelete(paramets,userElement.getOrgId(),userElement.getUserId());
 		return transactionsUpdata;
 	}
 
@@ -113,8 +115,8 @@ public class TransactionController extends BaseController {
 					"status:（0回复我的,1回复全部物业人员的,2全部物业人员回复的,3话题发起人回复的）,createDate:时间" )})
 	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
 	@RequestMapping(value="/transactionReplyList",method = RequestMethod.POST)
-	public ResponseBean transactionReplyList(@RequestBody String paramets, HttpSession session){
-		UserElement userElement = getUserElement(session);
+	public ResponseBean transactionReplyList(@RequestBody String paramets, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
 		ResponseBean  transactionReplyList= transactionService.transactionReplyList(paramets,userElement);
 		return transactionReplyList;
 	}
@@ -123,7 +125,7 @@ public class TransactionController extends BaseController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个)" )})
 	@RequestMapping(value="/deleteReply",method = RequestMethod.POST)
-	public ResponseBean deleteReply(@RequestBody String paramets, HttpSession session){
+	public ResponseBean deleteReply(@RequestBody String paramets, HttpServletRequest request){
 		ResponseBean  transactionsUpdata= transactionService.deleteReply(paramets);
 		return transactionsUpdata;
 	}
@@ -133,8 +135,8 @@ public class TransactionController extends BaseController {
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id，contentImg:评论所带图片,replyContent:评论内容" )})
 	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
 	@RequestMapping(value="/transactionReply/add",method = RequestMethod.POST)
-	public ResponseBean transactionReplyAdd(@RequestBody String paramets, HttpSession session){
-		UserElement userElement = getUserElement(session);
+	public ResponseBean transactionReplyAdd(@RequestBody String paramets, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
 		ResponseBean  transactionReplyAdd= transactionService.transactionReplyAdd(paramets,userElement);
 		return transactionReplyAdd;
 	}
@@ -144,8 +146,8 @@ public class TransactionController extends BaseController {
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =":举报人姓名，reportPhone：举报人电话,transactionId:帖子ID" )})
 	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
 	@RequestMapping(value="/transactionReportList",method = RequestMethod.POST)
-	public ResponseBean transactionReportList(@RequestBody String paramets, HttpSession session){
-		UserElement userElement = getUserElement(session);
+	public ResponseBean transactionReportList(@RequestBody String paramets, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
 		ResponseBean  transactionReplyList= transactionService.transactionReportList(paramets,userElement);
 		return transactionReplyList;
 	}

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

@@ -1,196 +0,0 @@
-package com.huiju.estateagents.property.controller;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
-import com.huiju.estateagents.property.service.IUserService;
-import com.huiju.estateagents.property.vo.UserVO;
-import com.google.common.collect.Maps;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpSession;
-import java.util.Map;
-
-/**
- * <p>
- * 物业web端用户表 前端控制器
- * </p>
- *
- * @author jobob
- * @since 2018-12-18
- */
-@RestController
-
-@RequestMapping("/")
-@Api(value = "物业端用户API", description = "物业端用户API")
-public class UserController extends BaseController {
-	
-	@Autowired
-	private IUserService userService;
-	
-	@ApiOperation(value = "获取用户列表",nickname = "获取用户信息")
-	@ApiImplicitParams({
-			//@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-	})
-	@RequestMapping(value = "/users",method = RequestMethod.GET)
-	public ResponseBean getInfo(HttpSession session) {
-		ResponseBean response = new ResponseBean();
-		response.addSuccess(userService.list());
-		Page a = new Page(1,10);
-//		response.addSuccess(userService.page(a));
-		return response;
-	}
-
-	@ApiOperation(value = "登陆", notes = "登陆")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "loginName手机号;code验证码;communityId小区Id"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
-	})
-	@RequestMapping(value = "/user/login", method = RequestMethod.POST)
-	public ResponseBean login(@RequestBody String parameter, HttpSession session){
-		ResponseBean responseBean = new ResponseBean();
-		JSONObject jsonObject = JSONObject.parseObject(parameter);
-		responseBean = userService.login(jsonObject.getString("loginName"),
-				jsonObject.getInteger("communityId"),
-				jsonObject.getString("code"));
-
-		// 为 0 表示成功
-		if ("0".equals(responseBean.getCode())) {
-			UserVO userVO = (UserVO)responseBean.getData();
-			setUserElement(session,userVO);
-			userVO.setToken(session.getId());
-		}
-
-		return responseBean;
-	}
-
-	@ApiOperation(value = "获取用户信息", notes = "获取用户信息")
-	@ApiImplicitParams({
-		@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
-		@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
-	})
-	@RequestMapping(value = "/user/info", method = RequestMethod.GET)
-	public ResponseBean info(HttpSession session){
-		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
-		responseBean = userService.userInfo(userElement);
-		UserVO userVO = (UserVO)responseBean.getData();
-		userVO.setCommunityId(userElement.getCommunityId());
-		return responseBean;
-	}
-
-	@ApiOperation(value = "注销登录", notes = "注销登录")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
-	})
-	@RequestMapping(value = "/user/logOut", method = RequestMethod.POST)
-	public ResponseBean longOut(HttpSession session){
-		ResponseBean responseBean = new ResponseBean();
-		cleanUserSession(session);
-		responseBean.addSuccess("退出成功!");
-		return responseBean;
-	}
-	@ApiOperation(value = "用户成员列表", notes = "用户成员列表")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号, " +
-					"userName：用户名,pageNum:第几页，pageSize：每页长度")
-	})
-	@RequestMapping(value = "/user/userList", method = RequestMethod.POST)
-	public ResponseBean userList(@RequestBody String parameter, HttpSession session){
-		UserElement userElement = getUserElement(session);
-		ResponseBean  responseBean = userService.userList(parameter,userElement.getCommunityId());
-		return responseBean;
-	}
-
-	@ApiOperation(value = "添加成员", notes = "用户成员列表")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名，menuArray[]：角色ID,remark:备注" )
-	})
-	@RequestMapping(value = "/user/addUser", method = RequestMethod.POST)
-	public ResponseBean addUser(@RequestBody String parameter, HttpSession session){
-		UserElement userElement = getUserElement(session);
-		ResponseBean  responseBean = userService.addUser(parameter,userElement.getId(),userElement.getCommunityId());
-		return responseBean;
-	}
-
-	@ApiOperation(value = "修改成员", notes = "修改成员")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名，menuArray[]：角色ID,remark:备注，id：修改id" )
-	})
-	@RequestMapping(value = "/user/upDate", method = RequestMethod.POST)
-	public ResponseBean upDate(@RequestBody String parameter, HttpSession session){
-		UserElement userElement = getUserElement(session);
-		ResponseBean  responseBean = userService.upDate(parameter,userElement.getId(),userElement.getCommunityId());
-		return responseBean;
-	}
-
-	@ApiOperation(value = "查看成员详情", notes = "查看成员详情")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value="id:当前id")
-	})
-	@RequestMapping(value = "/user/selectById", method = RequestMethod.POST)
-	public ResponseBean selectById(@RequestBody String parameter, HttpSession session){
-		UserElement userElement = getUserElement(session);
-		ResponseBean  responseBean = userService.selectById(parameter,userElement.getId());
-		return responseBean;
-	}
-
-	@ApiOperation(value = "修改当前状态", notes = "修改当前状态")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value=("status:传入当前状态(0:无效，1：有效),id:当前修改的id"))
-	})
-	@RequestMapping(value = "/user/upDateStatus", method = RequestMethod.POST)
-	public ResponseBean upDateStatus(@RequestBody String parameter, HttpSession session){
-		UserElement userElement = getUserElement(session);
-		ResponseBean  responseBean = userService.upDateStatus(parameter,userElement.getId());
-		return responseBean;
-	}
-
-	@ApiOperation(value = "查看所有角色", notes = "查看所有角色")
-	@RequestMapping(value = "/user/userRole", method = RequestMethod.POST)
-	public ResponseBean userRole(@RequestBody String parameter, HttpSession session){
-		UserElement userElement = getUserElement(session);
-		ResponseBean  responseBean = userService.allUserRole(userElement.getCommunityId());
-		return responseBean;
-	}
-
-	@ApiOperation(value = "获取令牌", notes = "获取令牌")
-	@ApiImplicitParams({
-			@ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "提供的appid"),
-			@ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
-			@ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "encrypt加密方式(目前值为md5)"),
-			@ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "communityId", value = "提供的小区编号"),
-			@ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "生成的签名"),
-	})
-	@RequestMapping(value = "/user/token", method = RequestMethod.GET)
-	public ResponseBean daSuToken(@RequestParam("appid") String appid,
-								  @RequestParam("datetime") String datetime,
-								  @RequestParam("encrypt") String encrypt,
-								  @RequestParam("communityId") String communityId,
-								  @RequestParam("sign") String sign,
-								  HttpSession session){
-		ResponseBean responseBean = new ResponseBean();
-		responseBean = userService.daSuToken(appid, datetime, encrypt, communityId, sign);
-		// 为 0 表示成功
-		if ("0".equals(responseBean.getCode())) {
-			UserVO userVO = (UserVO)responseBean.getData();
-			setUserElement(session,userVO);
-			userVO.setToken(session.getId());
-
-			Map<String, Object> map = Maps.newHashMap();
-			map.put("token", session.getId());
-			responseBean.addSuccess(map);
-		}
-		return responseBean;
-	}
-
-}

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

@@ -1,11 +1,9 @@
 package com.huiju.estateagents.property.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.taUser.service.ITaUserService;
-import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.BaseController;
-import com.huiju.estateagents.property.model.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.model.TaUserVerify;
 import com.huiju.estateagents.property.service.IBuildingOwnerInfoService;
 import com.huiju.estateagents.property.service.ITaUserVerifyService;
@@ -17,7 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 @RestController
@@ -48,10 +46,10 @@ public class UserVerifyController extends BaseController {
                                @RequestParam(value = "idCard", required = false) String idCard,
                                @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                               HttpSession session) {
+                               HttpServletRequest request) {
 
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iTaUserVerifyService.selectAll(phone, userName, idCard, pageNum, pageSize, userElement);
         return responseBean;
     }
@@ -67,10 +65,10 @@ public class UserVerifyController extends BaseController {
     public ResponseBean getAll(@PathVariable("userVerifyId") Integer userVerifyId,
                                @RequestParam("verifyStatus") Boolean verifyStatus,
                                @RequestParam(value = "remark", required = false) String remark,
-                               HttpSession session) {
+                               HttpServletRequest request) {
 
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iTaUserVerifyService.auditUser(userElement, userVerifyId, verifyStatus, remark);
         return responseBean;
     }
@@ -82,10 +80,10 @@ public class UserVerifyController extends BaseController {
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "ownerTel", value = "手机号"),
     })
     public ResponseBean taUserHas(@RequestParam("ownerTel") String ownerTel,
-                               HttpSession session) {
+                               HttpServletRequest request) {
 
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         QueryWrapper<TaUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("login_name", ownerTel);
 //        TaUser user = iTaUserService.getOne(queryWrapper);
@@ -112,10 +110,10 @@ public class UserVerifyController extends BaseController {
                                @RequestParam("unitId")Integer unitId,
                                @RequestParam("levelId")Integer levelId,
                                @RequestParam("roomNoId")Integer roomNoId,
-                               HttpSession session) {
+                               HttpServletRequest request) {
 
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("boolRole", false);
@@ -166,9 +164,9 @@ public class UserVerifyController extends BaseController {
                                @RequestParam("verifyStatus") String verifyStatus,
                                @RequestParam("roleState") String roleState,
                                @RequestParam(value = "remark", required = false) String remark,
-                               HttpSession session) {
+                               HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
+        TaUser userElement = getTaUser(request);
         responseBean = iTaUserVerifyService.verifyinfoAdd(userElement, userVerifyId, verifyStatus, roleState,remark);
         return responseBean;
     }

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

@@ -1,158 +0,0 @@
-package com.huiju.estateagents.property.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 住户app端用户表
- * </p>
- *
- * @author jobob
- * @since 2018-12-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("ta_user")
-public class TaUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 小区id
-     */
-    private Integer communityId;
-
-    /**
-     * 楼栋业主资料信息id
-     */
-    private Integer buildingOwnerInfoId;
-
-    /**
-     * 头像
-     */
-    private String headPortrait;
-
-    /**
-     * 用户姓名
-     */
-    private String userName;
-
-    /**
-     * 登录账号就是手机号确保唯一
-     */
-    private String loginName;
-
-    /**
-     * 登录密码
-     */
-    private String loginPassword;
-
-    /**
-     * 邮箱
-     */
-    private String email;
-
-    /**
-     * 性别 1：男   2：女
-     */
-    private String gender;
-
-    /**
-     * 1 有效 0 无效(逻辑删除)
-     */
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 上级目录id存在，表示是这个id下的租客或家属
-     */
-    private Integer parentId;
-
-    /**
-     * 接受协议状态  0 是未接受 1是已接受
-     */
-    private String acceptAgreementStatus;
-
-    /**
-     * 认证状态  0 是未认证    1是认证通过   2是已作废
-     */
-    private String verifyStatus;
-
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createDate;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateDate;
-
-    /**
-     * 海康人员编号
-     */
-    private Long hkPersonNo;
-
-    /**
-     * 海康人员ID
-     */
-    private Integer hkUserId;
-
-    /**
-     * 海康 卡片号码
-     */
-    private String hkCardNo;
-
-    /**
-     * 人脸状态  0 是未上传   1是已上传   register/unregister
-     */
-    private String faceStatus;
-
-    /**
-     * 身份证号
-     */
-    private String idCard;
-
-    /**
-     * 微信 openid
-     */
-    private String openid;
-
-    /**
-     * 微信昵称
-     */
-    private String nickname;
-
-    /**
-     * 身份
-     */
-    @TableField(exist = false)
-    private String description;
-}

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.property.service;
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -19,7 +20,7 @@ public interface BuildingTreeServiceI {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean submitExcelData(MultipartFile file, UserElement userElement);
+	ResponseBean submitExcelData(MultipartFile file, TaUser userElement);
 	
 	/**
 	 * 获取树形数据

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.BillInvoice;
 
@@ -24,7 +25,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param parameter
      * @return
      */
-    ResponseBean getBillList(String parameter, UserElement userElement);
+    ResponseBean getBillList(String parameter, TaUser userElement);
 
     /**
      * 批量删除 缴费单
@@ -32,7 +33,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param userElement
      * @return
      */
-    ResponseBean deleteBillInvoice(List<Integer> ids, UserElement userElement);
+    ResponseBean deleteBillInvoice(List<Integer> ids, TaUser userElement);
 
     /**
      * 设置线下缴费
@@ -40,7 +41,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param userElement
      * @return
      */
-    ResponseBean offlinePayment(List<Integer> ids, UserElement userElement);
+    ResponseBean offlinePayment(List<Integer> ids, TaUser userElement);
 
     /**
      * 由前台批量添加收费单, 默认定为 作废
@@ -48,7 +49,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param userElement
      * @return
      */
-    ResponseBean addTempBillInvoice(String parameter, UserElement userElement);
+    ResponseBean addTempBillInvoice(String parameter, TaUser userElement);
 
     /**
      * 由前台批量添加收费单, 进行统一的提交, 修改为有效
@@ -56,7 +57,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param userElement
      * @return
      */
-    ResponseBean updateBillInvoiceStatus(List<Integer> ids, UserElement userElement);
+    ResponseBean updateBillInvoiceStatus(List<Integer> ids, TaUser userElement);
 
     /**
      * 查询由前台批量添加的收费单
@@ -64,7 +65,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param userElement
      * @return
      */
-    ResponseBean getTempBillInvoice(Integer billId, UserElement userElement);
+    ResponseBean getTempBillInvoice(Integer billId, TaUser userElement);
 
     /**
      * 根据id删除收费单, 只能删除作废的
@@ -72,7 +73,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param userElement
      * @return
      */
-    ResponseBean deleteTempBillInvoice(Integer billId, UserElement userElement);
+    ResponseBean deleteTempBillInvoice(Integer billId, TaUser userElement);
 
     /**
      * 根据缴费单id, 修改金额
@@ -81,7 +82,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param userElement
      * @return
      */
-    ResponseBean updateBillInvoiceIdPayPrice(Integer billId, Integer payPrice, UserElement userElement);
+    ResponseBean updateBillInvoiceIdPayPrice(Integer billId, Integer payPrice, TaUser userElement);
 
     /**
      * 导出Excel 表格
@@ -90,7 +91,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param billId
      * @return
      */
-    ResponseBean exportExcel(UserElement userElement, Integer billId);
+    ResponseBean exportExcel(TaUser userElement, Integer billId);
 
     /**
      * 根据 缴费项id 出现作废的数据
@@ -98,7 +99,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param parameter
      * @return
      */
-    ResponseBean getInvoiceInvalid(UserElement userElement, String parameter);
+    ResponseBean getInvoiceInvalid(TaUser userElement, String parameter);
     
     /**
      * 按小区统计所有的金额

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpBillOrder;
 
@@ -21,6 +22,6 @@ public interface IBillOrderService extends IService<TpBillOrder> {
      * @param orderNumber
      * @return
      */
-    ResponseBean getByOrderNumberBillInvoice(UserElement userElement, String orderNumber);
+    ResponseBean getByOrderNumberBillInvoice(TaUser userElement, String orderNumber);
 
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.Bill;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,7 +27,7 @@ public interface IBillService extends IService<Bill> {
      * @param userElement
      * @return
      */
-    ResponseBean updateBillNameAndBillExplainAndEndDate(UserElement userElement, String parameter);
+    ResponseBean updateBillNameAndBillExplainAndEndDate(TaUser userElement, String parameter);
 
     /**
      * 根据ID查询 缴费项
@@ -49,7 +50,7 @@ public interface IBillService extends IService<Bill> {
 	 * @param file
 	 * @return
 	 */
-    ResponseBean getExcelData(MultipartFile file, UserElement userElement);
+    ResponseBean getExcelData(MultipartFile file, TaUser userElement);
 
 	/**
 	 * 上传excel, 解析 入库
@@ -61,7 +62,7 @@ public interface IBillService extends IService<Bill> {
 	 * @param billStatus
 	 * @return
 	 */
-	ResponseBean getExcelData(Integer billId, MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, UserElement userElement);
+	ResponseBean getExcelData(Integer billId, MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, TaUser userElement);
 
 	/**
 	 * 修改 缴费项状态
@@ -69,7 +70,7 @@ public interface IBillService extends IService<Bill> {
 	 * @param id
 	 * @return
 	 */
-	ResponseBean updateBillStatus(UserElement userElement, Integer billStatus, Integer id);
+	ResponseBean updateBillStatus(TaUser userElement, Integer billStatus, Integer id);
 
 	/**
 	 * 批量删除 缴费项
@@ -77,12 +78,12 @@ public interface IBillService extends IService<Bill> {
 	 * @param ids id 集合
 	 * @return
 	 */
-    ResponseBean deleteBillBeach(UserElement userElement, List<Integer> ids);
+    ResponseBean deleteBillBeach(TaUser userElement, List<Integer> ids);
 
 	/**
 	 * 下载 excel 模板
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean downloadExcel(UserElement userElement);
+	ResponseBean downloadExcel(TaUser userElement);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.BillStatement;
 
@@ -21,12 +22,12 @@ public interface IBillStatementService extends IService<BillStatement> {
      * @param parameter
      * @return
      */
-    ResponseBean getBillStatement(UserElement userElement, String parameter);
+    ResponseBean getBillStatement(TaUser userElement, String parameter);
 
     /**
      * 导出Excel
      * @param userElement
      * @return
      */
-    ResponseBean exportExcel(UserElement userElement);
+    ResponseBean exportExcel(TaUser userElement);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
 import org.springframework.web.multipart.MultipartFile;
@@ -29,7 +30,7 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param userElement 用户登陆后的信息
      * @return
      */
-    ResponseBean listQuery(String parameter, UserElement userElement);
+    ResponseBean listQuery(String parameter, TaUser userElement);
 
     /**
      * 修改 楼栋业主信息
@@ -37,7 +38,7 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param userElement
      * @return
      */
-    ResponseBean update(String parameter, UserElement userElement);
+    ResponseBean update(String parameter, TaUser userElement);
 
     /**
      * 添加 楼栋业主信息
@@ -45,7 +46,7 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param userElement
      * @return
      */
-    ResponseBean add(String parameter, UserElement userElement);
+    ResponseBean add(String parameter, TaUser userElement);
     
     /**
      * 根据excel获取相关信息
@@ -70,7 +71,7 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param userElement
      * @return
      */
-    ResponseBean submitExcelData(MultipartFile file, UserElement userElement);
+    ResponseBean submitExcelData(MultipartFile file, TaUser userElement);
 
     /**
      * 认证用户是否停用
@@ -93,7 +94,7 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param userElement
      * @return
      */
-    ResponseBean buildinglist(String paramets, UserElement userElement);
+    ResponseBean buildinglist(String paramets, TaUser userElement);
 
     /**
      * 小区楼栋资料表-查询 楼栋/单元/楼层/户号
@@ -116,7 +117,7 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param userElement
      * @return
      */
-    ResponseBean downloadExcel(UserElement userElement);
+    ResponseBean downloadExcel(TaUser userElement);
     
     /**
      * 获取楼栋信息
@@ -156,5 +157,5 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param userElement
      * @return
      */
-    ResponseBean buildingDetails(String paramets, UserElement userElement);
+    ResponseBean buildingDetails(String paramets, TaUser userElement);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.Hotel;
 
@@ -28,7 +29,7 @@ public interface IHotelService extends IService<Hotel> {
      * @param parameter
      * @return
      */
-    ResponseBean hotelRoomAdd(String parameter, UserElement userElement);
+    ResponseBean hotelRoomAdd(String parameter, TaUser userElement);
 
     /**
      * 编辑房间
@@ -36,7 +37,7 @@ public interface IHotelService extends IService<Hotel> {
      * @param userElement
      * @return
      */
-    ResponseBean hotelRoomEdit(String parameter, UserElement userElement);
+    ResponseBean hotelRoomEdit(String parameter, TaUser userElement);
 
     /**
      * 修改上架或下架
@@ -44,14 +45,14 @@ public interface IHotelService extends IService<Hotel> {
      * @param userElement
      * @return
      */
-    ResponseBean hotelRoomRoomStatus(String parameter, UserElement userElement);
+    ResponseBean hotelRoomRoomStatus(String parameter, TaUser userElement);
 	
 	/**
 	 * 根据小区id获取酒店信息
 	 * @param userElement
 	 * @return
 	 */
-	Hotel getHotelData(UserElement userElement);
+	Hotel getHotelData(TaUser userElement);
 	
 	/**
 	 * 添加或修改酒店
@@ -59,5 +60,5 @@ public interface IHotelService extends IService<Hotel> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean addHotel(Hotel hotel, UserElement userElement);
+	ResponseBean addHotel(Hotel hotel, TaUser userElement);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.SysMenu;
 
@@ -20,5 +21,5 @@ public interface ISysMenuService extends IService<SysMenu> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean getMenuList(UserElement userElement);
+	ResponseBean getMenuList(TaUser userElement);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TaUserLicenseOrder;
 
@@ -27,14 +28,14 @@ public interface ITaUserLicenseOrderService extends IService<TaUserLicenseOrder>
      * @param paymentTel
      * @return
      */
-    ResponseBean getAll(Integer id, String licensePlate, String orderNumber, String paymentName, String paymentTel, Integer pageNum, Integer pageSize, UserElement userElement);
+    ResponseBean getAll(Integer id, String licensePlate, String orderNumber, String paymentName, String paymentTel, Integer pageNum, Integer pageSize, TaUser userElement);
 
     /**
      * 导出数据
      * @param userElement
      * @return
      */
-    ResponseBean exportDate(UserElement userElement);
+    ResponseBean exportDate(TaUser userElement);
 	
 	List<Map<String, Object>> getPriceCount();
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TaUserVerify;
 
@@ -20,7 +21,7 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      * @param userElement
      * @return
      */
-    ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize, UserElement userElement);
+    ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement);
 
     /**
      * 审核 用户
@@ -30,7 +31,7 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      * @param remark
      * @return
      */
-    ResponseBean auditUser(UserElement userElement, Integer userVerifyId, Boolean verifyStatus, String remark);
+    ResponseBean auditUser(TaUser userElement, Integer userVerifyId, Boolean verifyStatus, String remark);
 
     /**
      * 楼栋详情页面审核审核
@@ -40,6 +41,6 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      * @param remark
      * @return
      */
-    ResponseBean verifyinfoAdd(UserElement userElement, Integer userVerifyId, String verifyStatus, String roleState, String remark);
+    ResponseBean verifyinfoAdd(TaUser userElement, Integer userVerifyId, String verifyStatus, String roleState, String remark);
 
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TaVisitorLicenseSetting;
 
@@ -23,13 +24,13 @@ public interface ITaVisitorLicenseSettingService extends IService<TaVisitorLicen
      * @param visitorLicenseBool
      * @return
      */
-    ResponseBean saveOrDelete(UserElement userElement, Boolean visitorLicenseBool);
+    ResponseBean saveOrDelete(TaUser userElement, Boolean visitorLicenseBool);
 
     /**
      * 获取 访客邀请车辆是否开启
      * @param userElement
      * @return
      */
-    ResponseBean getVisitorLicense(UserElement userElement);
+    ResponseBean getVisitorLicense(TaUser userElement);
 
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpActivity;
 
@@ -23,7 +24,7 @@ public interface ITpActivityService extends IService<TpActivity> {
      * @param userElement 用户登录信息体
      * @return
      */
-    ResponseBean listQuery(String parameter, UserElement userElement);
+    ResponseBean listQuery(String parameter, TaUser userElement);
 
     /**
      * 添加活动列表
@@ -31,7 +32,7 @@ public interface ITpActivityService extends IService<TpActivity> {
      * @param userElement
      * @return
      */
-    ResponseBean addActivity(String parameter, UserElement userElement);
+    ResponseBean addActivity(String parameter, TaUser userElement);
 
     /**
      * 修改 活动
@@ -39,7 +40,7 @@ public interface ITpActivityService extends IService<TpActivity> {
      * @param userElement
      * @return
      */
-    ResponseBean updateActivity(String parameter, UserElement userElement);
+    ResponseBean updateActivity(String parameter, TaUser userElement);
 
     /**
      * 根据 活动Id 查询
@@ -54,6 +55,6 @@ public interface ITpActivityService extends IService<TpActivity> {
      * @param userElement 用户session信息体
      * @return
      */
-    ResponseBean updateStatusInvalid(List<Integer> ids, UserElement userElement);
+    ResponseBean updateStatusInvalid(List<Integer> ids, TaUser userElement);
 
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpEquipment;
 
@@ -23,7 +24,7 @@ public interface ITpEquipmentService extends IService<TpEquipment> {
      * @param equipmentType
      * @return
      */
-    ResponseBean getAllByCommunityAndEquipmentType(UserElement userElement, Integer equipmentType);
+    ResponseBean getAllByCommunityAndEquipmentType(TaUser userElement, Integer equipmentType);
 
     /**
      * 修改或者添加 监控设备
@@ -31,7 +32,7 @@ public interface ITpEquipmentService extends IService<TpEquipment> {
      * @param userElement
      * @return
      */
-    ResponseBean saveOrUpdateMonitoring(String parameter, UserElement userElement);
+    ResponseBean saveOrUpdateMonitoring(String parameter, TaUser userElement);
 
     /**
      * 删除设备
@@ -47,7 +48,7 @@ public interface ITpEquipmentService extends IService<TpEquipment> {
      * @param id
      * @return
      */
-    ResponseBean getMonitoringById(UserElement userElement, Integer type, Integer id);
+    ResponseBean getMonitoringById(TaUser userElement, Integer type, Integer id);
 
     /**
      * 批量删除

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpRentalHouse;
 
@@ -29,7 +30,7 @@ public interface ITpRentalHouseService extends IService<TpRentalHouse> {
 	 * @param pageSize
 	 * @return
 	 */
-	ResponseBean getRentalList(Integer id, String houseName, Integer startPrice, Integer endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize);
+	ResponseBean getRentalList(Integer id, String houseName, Integer startPrice, Integer endPrice, String rentalType, String houseType, String houseStatus, TaUser userElement, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 保存长租公寓房间信息
@@ -37,7 +38,7 @@ public interface ITpRentalHouseService extends IService<TpRentalHouse> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean saveRental(TpRentalHouse rentalHouse, UserElement userElement);
+	ResponseBean saveRental(TpRentalHouse rentalHouse, TaUser userElement);
 	
 	/**
 	 * 根据ID取值
@@ -52,5 +53,5 @@ public interface ITpRentalHouseService extends IService<TpRentalHouse> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean updateRental(TpRentalHouse rentalHouse, UserElement userElement);
+	ResponseBean updateRental(TpRentalHouse rentalHouse, TaUser userElement);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpShop;
 
@@ -26,7 +27,7 @@ public interface ITpShopService extends IService<TpShop> {
 	 * @param pageSize
 	 * @return
 	 */
-	ResponseBean getShopList(Integer id, String shopName, Integer shopTypeId, String shopStatus, UserElement userElement, Integer pageNum, Integer pageSize);
+	ResponseBean getShopList(Integer id, String shopName, Integer shopTypeId, String shopStatus, TaUser userElement, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 保存商铺
@@ -34,7 +35,7 @@ public interface ITpShopService extends IService<TpShop> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean saveShop(TpShop shop, UserElement userElement);
+	ResponseBean saveShop(TpShop shop, TaUser userElement);
 	
 	/**
 	 * 获取商铺信息
@@ -49,5 +50,5 @@ public interface ITpShopService extends IService<TpShop> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean updateShop(TpShop shop, UserElement userElement);
+	ResponseBean updateShop(TpShop shop, TaUser userElement);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpShopSetting;
 
@@ -21,5 +22,5 @@ public interface ITpShopSettingService extends IService<TpShopSetting> {
 	 * @param jsonString
 	 * @return
 	 */
-	ResponseBean changeShopSetting(UserElement userElement, String jsonString);
+	ResponseBean changeShopSetting(TaUser userElement, String jsonString);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpTransaction;
 
@@ -37,7 +38,7 @@ public interface ITransactionService extends IService<TpTransaction> {
 	 * @param userElement
 	 * @return
 	 */
-    ResponseBean transactionsAdd(String paramets, UserElement userElement);
+    ResponseBean transactionsAdd(String paramets, TaUser userElement);
 
 	/**
 	 * 修改二手交易
@@ -63,7 +64,7 @@ public interface ITransactionService extends IService<TpTransaction> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean transactionReplyList(String paramets, UserElement userElement);
+	ResponseBean transactionReplyList(String paramets, TaUser userElement);
 
 	/**
 	 * 删除二手帖子评论
@@ -78,7 +79,7 @@ public interface ITransactionService extends IService<TpTransaction> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean transactionReplyAdd(String paramets, UserElement userElement);
+	ResponseBean transactionReplyAdd(String paramets, TaUser userElement);
 
 	/**
 	 * 二手帖子举报列表
@@ -86,5 +87,5 @@ public interface ITransactionService extends IService<TpTransaction> {
 	 * @param userElement
 	 * @return
 	 */
-    ResponseBean transactionReportList(String paramets, UserElement userElement);
+    ResponseBean transactionReportList(String paramets, TaUser userElement);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.User;
 
@@ -37,7 +38,7 @@ public interface IUserService extends IService<User> {
      * @param userElement 用户登陆后的信息体
      * @return
      */
-    ResponseBean userInfo(UserElement userElement);
+    ResponseBean userInfo(TaUser userElement);
 
     /**
      * 获取成员列表

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.property.service;
 
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 
 import java.util.Map;
@@ -11,5 +12,5 @@ public interface IndexCountServiceI {
 	 * @param userElement
 	 * @return
 	 */
-	Map<String, Object> getIndexCount(UserElement userElement);
+	Map<String, Object> getIndexCount(TaUser userElement);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.SysRole;
 
@@ -15,7 +16,7 @@ public interface RoleServiceI extends IService<SysRole> {
 	 * @param pageSize
 	 * @return
 	 */
-	ResponseBean getRoleList(String roleName, UserElement userElement, Integer pageNum, Integer pageSize);
+	ResponseBean getRoleList(String roleName, TaUser userElement, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 添加角色
@@ -23,7 +24,7 @@ public interface RoleServiceI extends IService<SysRole> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean addRole(SysRole sysRole, UserElement userElement);
+	ResponseBean addRole(SysRole sysRole, TaUser userElement);
 	
 	/**
 	 * 获取角色详情
@@ -31,7 +32,7 @@ public interface RoleServiceI extends IService<SysRole> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean getRoleInfo(Integer id, UserElement userElement);
+	ResponseBean getRoleInfo(Integer id, TaUser userElement);
 	
 	/**
 	 * 修改角色
@@ -39,7 +40,7 @@ public interface RoleServiceI extends IService<SysRole> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean updateRole(SysRole sysRole, UserElement userElement);
+	ResponseBean updateRole(SysRole sysRole, TaUser userElement);
 	
 	/**
 	 * 批量删除角色
@@ -47,5 +48,5 @@ public interface RoleServiceI extends IService<SysRole> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean deleteRole(SysRole sysRole, UserElement userElement);
+	ResponseBean deleteRole(SysRole sysRole, TaUser userElement);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.*;
@@ -69,7 +70,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     private TpBillOrderMapper tpBillOrderMapper;
 
     @Override
-    public ResponseBean getBillList(String parameter, UserElement userElement) {
+    public ResponseBean getBillList(String parameter, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
 
@@ -101,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.getCommunityId());
+        map.put("communityId", userElement.getOrgId());
 
 
         Page<BillInvoice> page = new Page<>();
@@ -128,7 +129,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean deleteBillInvoice(List<Integer> ids, UserElement userElement) {
+    public ResponseBean deleteBillInvoice(List<Integer> ids, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         if (null == userElement) {
             responseBean.addError("请登录后操作");
@@ -160,7 +161,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean offlinePayment(List<Integer> ids, UserElement userElement) {
+    public ResponseBean offlinePayment(List<Integer> ids, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         if (null == userElement) {
             responseBean.addError("请登录后操作");
@@ -181,7 +182,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 插入流水
                 BillStatement billStatement = new BillStatement();
-                billStatement.setCommunityId(userElement.getCommunityId());
+                billStatement.setCommunityId(userElement.getOrgId());
                 billStatement.setBillInvoiceId(billInvoice.getId());
                 billStatement.setTaUserId(billInvoice.getTaUserId());
                 billStatement.setPayPrice(billInvoice.getPayPrice());
@@ -211,7 +212,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 生成订单
                 TpBillOrder tpBillOrder = new TpBillOrder();
-                tpBillOrder.setCommunityId(userElement.getCommunityId());
+                tpBillOrder.setCommunityId(userElement.getOrgId());
                 tpBillOrder.setTpBillId(billInvoice.getBillId());
                 tpBillOrder.setTpBillInvoiceId(billInvoice.getId());
 
@@ -221,9 +222,9 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 // 缴费状态  0：未支付  1: 已支付 2: 正在支付中
                 tpBillOrder.setOrderStatus("1");
                 tpBillOrder.setCreateDate(LocalDateTime.now());
-                tpBillOrder.setCreateUser(userElement.getId());
+                tpBillOrder.setCreateUser(userElement.getUserId());
                 tpBillOrder.setUpdateDate(LocalDateTime.now());
-                tpBillOrder.setUpdateUser(userElement.getId());
+                tpBillOrder.setUpdateUser(userElement.getUserId());
 
                 tpBillOrderMapper.insert(tpBillOrder);
 
@@ -231,7 +232,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 把相对应的 APP端用户的代办消息进行设置为无效
                 QueryWrapper<Message> messageQueryWrapper = new QueryWrapper<>();
-                messageQueryWrapper.eq("community_id", userElement.getCommunityId());
+                messageQueryWrapper.eq("community_id", userElement.getOrgId());
                 messageQueryWrapper.eq("bill_id", billInvoice.getId());
                 messageQueryWrapper.eq("uuid_type", "1");
                 messageQueryWrapper.eq("uuid", billInvoice.getTaUserId());
@@ -256,7 +257,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean addTempBillInvoice(String parameter, UserElement userElement) {
+    public ResponseBean addTempBillInvoice(String parameter, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         // 收费项ID
@@ -288,7 +289,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
         // 校验 期/区/栋/单元/楼层/户号
         QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
-        roomNoQueryWrapper.eq("community_id", userElement.getCommunityId());
+        roomNoQueryWrapper.eq("community_id", userElement.getOrgId());
         roomNoQueryWrapper.eq("phase_id", phase);
         roomNoQueryWrapper.eq("building_id", building);
         roomNoQueryWrapper.eq("unit_id", unit);
@@ -309,11 +310,11 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
         // 设置房号
         billInvoice.setBillId(billId);
-        billInvoice.setCommunityId(userElement.getCommunityId());
+        billInvoice.setCommunityId(userElement.getOrgId());
         billInvoice.setBillInvoiceExplain(billInvoiceExplain);
 //        billInvoice.setPayPrice(PayPriceUtils.yuanConversionPoints(payPrice));
         billInvoice.setBillStatus("0");
-        billInvoice.setCreateUser(userElement.getId());
+        billInvoice.setCreateUser(userElement.getUserId());
         billInvoice.setCreateDate(new Date());
         billInvoice.setRoomNoId(roomNo);
         billInvoice.setStatus(0);
@@ -329,7 +330,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateBillInvoiceStatus(List<Integer> ids, UserElement userElement) {
+    public ResponseBean updateBillInvoiceStatus(List<Integer> ids, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         List<BillInvoice> billInvoices = ids.stream().map(e -> {
@@ -355,7 +356,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
             // 往APP端用户上面的每一个用户推送
             Message messageModelAPP = new Message();
-            messageModelAPP.setCommunityId(userElement.getCommunityId());
+            messageModelAPP.setCommunityId(userElement.getOrgId());
             messageModelAPP.setMessageType("7");
             messageModelAPP.setAdviceType("1");
             messageModelAPP.setModelType("2");
@@ -366,7 +367,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
             messageModelAPP.setMessageContent("您有待缴费的账单，点击查看并缴费 " + dateFormat.format(new Date()) + bill.getBillName());
             messageModelAPP.setStatus("1");
             messageModelAPP.setCreateDate(LocalDateTime.now());
-            messageModelAPP.setCreateUser(userElement.getId());
+            messageModelAPP.setCreateUser(userElement.getUserId());
             messageModelAPP.setBillId(e.getId());
 
             return messageModelAPP;
@@ -379,11 +380,11 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     }
 
     @Override
-    public ResponseBean getTempBillInvoice(Integer billId,UserElement userElement) {
+    public ResponseBean getTempBillInvoice(Integer billId,TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> map = Maps.newHashMap();
         map.put("billId", billId);
-        map.put("communityId", userElement.getCommunityId());
+        map.put("communityId", userElement.getOrgId());
 
         List<BillInvoice> billInvoices = billInvoiceMapper.selectBillInvoiceTemp(map);
 
@@ -393,7 +394,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean deleteTempBillInvoice(Integer billId, UserElement userElement) {
+    public ResponseBean deleteTempBillInvoice(Integer billId, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         if (null == userElement) {
             responseBean.addError("未登录,无法操作!");
@@ -415,7 +416,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateBillInvoiceIdPayPrice(Integer billId, Integer payPrice, UserElement userElement) {
+    public ResponseBean updateBillInvoiceIdPayPrice(Integer billId, Integer payPrice, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         BillInvoice billInvoice = billInvoiceMapper.selectById(billId);
         if ("1".equals(billInvoice.getBillStatus()) || "2".equals(billInvoice.getBillStatus())) {
@@ -424,7 +425,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         }
         // 此处存储的是已经转换过的金额
         billInvoice.setPayPrice(payPrice);
-        billInvoice.setUpdateUser(userElement.getId());
+        billInvoice.setUpdateUser(userElement.getUserId());
         billInvoice.setUpdateDate(new Date());
 
         int result = billInvoiceMapper.updateById(billInvoice);
@@ -436,7 +437,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     }
 
     @Override
-    public ResponseBean exportExcel(UserElement userElement, Integer billId) {
+    public ResponseBean exportExcel(TaUser userElement, Integer billId) {
         ResponseBean responseBean = new ResponseBean();
         String [] title = new String[] { "收费单号","房屋信息","收费单说明","金额(元)","流水","缴费状态","缴费人","缴费时间","新建时间","新建人","修改人","修改时间" };
 
@@ -451,7 +452,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
      * @param workbook
      * @return
      */
-    private HSSFWorkbook excel(String[] title, UserElement userElement, Integer billId, HSSFWorkbook workbook) {
+    private HSSFWorkbook excel(String[] title, TaUser userElement, Integer billId, HSSFWorkbook workbook) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
         if (null == workbook) {
@@ -479,7 +480,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("billId", billId);
-        map.put("communityId", userElement.getCommunityId());
+        map.put("communityId", userElement.getOrgId());
 
         Page<BillInvoice> page = new Page<>();
         page.setCurrent(1);
@@ -564,7 +565,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
 
     @Override
-    public ResponseBean getInvoiceInvalid(UserElement userElement, String parameter) {
+    public ResponseBean getInvoiceInvalid(TaUser userElement, String parameter) {
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         Integer pageNum = jsonObject.getInteger("pageNum");
@@ -579,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.getCommunityId());
+        billInvoiceQueryWrapper.eq("community_id", userElement.getOrgId());
 
         IPage<BillInvoice> billInvoiceIPage = billInvoiceMapper.selectPage(page, billInvoiceQueryWrapper);
         List<BillInvoice> records = billInvoiceIPage.getRecords();

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.property.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.BillInvoiceMapper;
 import com.huiju.estateagents.property.dao.TpBillOrderMapper;
@@ -37,7 +38,7 @@ public class BillOrderServiceImpl extends ServiceImpl<TpBillOrderMapper, TpBillO
     private BillInvoiceMapper billInvoiceMapper;
 
     @Override
-    public ResponseBean getByOrderNumberBillInvoice(UserElement userElement, String orderNumber) {
+    public ResponseBean getByOrderNumberBillInvoice(TaUser userElement, String orderNumber) {
         ResponseBean responseBean = new ResponseBean();
 
         // 1.根据订单查询出所有的缴费组

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
@@ -98,7 +99,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateBillNameAndBillExplainAndEndDate(UserElement userElement, String parameter) {
+    public ResponseBean updateBillNameAndBillExplainAndEndDate(TaUser userElement, String parameter) {
         ResponseBean responseBean = new ResponseBean();
         Bill bill = JSONObject.parseObject(parameter, Bill.class);
         if (StringUtils.isEmpty(bill.getBillName())) {
@@ -157,14 +158,14 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean getExcelData(MultipartFile file, UserElement userElement) {
+    public ResponseBean getExcelData(MultipartFile file, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         if (file == null) {
             responseBean.addError("对象不能为空");
             return responseBean;
         }
 
-        responseBean = getExcelData(file, responseBean, userElement.getCommunityId());
+        responseBean = getExcelData(file, responseBean, userElement.getOrgId());
         List<TempBill> tempBills = (List<TempBill>) responseBean.getData();
 
         Map<String, Object> map = Maps.newHashMap();
@@ -177,7 +178,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean getExcelData(Integer billId, MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, UserElement userElement) {
+    public ResponseBean getExcelData(Integer billId, MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         // 获取本地时间
@@ -202,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.getCommunityId());
+            billInvoiceQueryWrapper.eq("community_id", userElement.getOrgId());
             records = billInvoiceMapper.selectList(billInvoiceQueryWrapper);
         }
 
@@ -212,7 +213,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             return responseBean;
         }
 
-        responseBean = getExcelData(file, responseBean, userElement.getCommunityId());
+        responseBean = getExcelData(file, responseBean, userElement.getOrgId());
         List<TempBill> tempBills = (List<TempBill>) responseBean.getData();
 
         Double sumDouble = 0.0;
@@ -243,9 +244,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         //为草稿时不创建时间, 2表示草稿
         if(!"2".equals(billStatus)) {
             bill.setCreateDate(new Date());
-            bill.setCreateUser(userElement.getId());
+            bill.setCreateUser(userElement.getUserId());
         }
-        bill.setCommunityId(userElement.getCommunityId());
+        bill.setCommunityId(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);
@@ -263,7 +264,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             bill.setCreateDate(null);
             if(!"2".equals(billStatus)) {
                 bill.setCreateDate(new Date());
-                bill.setCreateUser(userElement.getId());
+                bill.setCreateUser(userElement.getUserId());
             }
             // 设置主键, 表示修改
             bill.setId(billId);
@@ -273,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.getCommunityId());
+            queryWrapper.eq("community_id", userElement.getOrgId());
             queryWrapper.eq("message_type", "7");
             queryWrapper.eq("model_type", "2");
             queryWrapper.eq("source", "2");
@@ -284,18 +285,18 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             // 草稿时插入消息
             if ("2".equals(bill.getBillStatus()) && null == message) {
                 message = new Message();
-                message.setCommunityId(userElement.getCommunityId());
+                message.setCommunityId(userElement.getOrgId());
                 message.setMessageType("7");
                 message.setAdviceType("4");
                 message.setModelType("2");
-                message.setUuid(userElement.getId());
+                message.setUuid(userElement.getUserId());
                 message.setUuidType("2");
                 // 消息是物业端发过来的, 就是 2
                 message.setSource("2");
                 message.setMessageContent("收费组“" + bill.getBillName() +  "”还未发布，点击发布");
                 message.setStatus("1");
                 message.setCreateDate(LocalDateTime.now());
-                message.setCreateUser(userElement.getId());
+                message.setCreateUser(userElement.getUserId());
                 message.setBillId(bill.getId());
 
                 messageMapper.insert(message);
@@ -306,17 +307,17 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 if (null != message) {
                     message.setStatus("0");
                     message.setUpdateDate(LocalDateTime.now());
-                    message.setUpdateUser(userElement.getId());
+                    message.setUpdateUser(userElement.getUserId());
                     messageMapper.updateById(message);
                 }
 
                 // 插入消息表, 消息类型为 消息
                 Message messageModel = new Message();
-                messageModel.setCommunityId(userElement.getCommunityId());
+                messageModel.setCommunityId(userElement.getOrgId());
                 messageModel.setMessageType("7");
                 messageModel.setAdviceType("4");
                 messageModel.setModelType("1");
-                messageModel.setUuid(userElement.getId());
+                messageModel.setUuid(userElement.getUserId());
                 messageModel.setUuidType("2");
                 // 消息是物业端发过来的, 就是 2
                 messageModel.setSource("2");
@@ -324,7 +325,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 //                messageModel.setMessageContent("收费组“" + bill.getBillName() + "”还有" + DateUtils.getDaysBetween(new Date(), bill.getEndDate()) + "天就到截止日期了，但还有未缴用户，点击去查看");
                 messageModel.setStatus("1");
                 messageModel.setCreateDate(LocalDateTime.now());
-                messageModel.setCreateUser(userElement.getId());
+                messageModel.setCreateUser(userElement.getUserId());
                 messageModel.setBillId(bill.getId());
 
                 messageMapper.insert(messageModel);
@@ -333,13 +334,13 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             }
             List<BillInvoice> billInvoices = tempBills.stream().map(e -> {
                 BillInvoice billInvoice = new BillInvoice();
-                billInvoice.setCommunityId(userElement.getCommunityId());
+                billInvoice.setCommunityId(userElement.getOrgId());
                 billInvoice.setBillId(bill.getId());
 
                 /**
                  * 查询房号
                  */
-                TpRoomNo tpRoomNo = tpRoomNoMapper.selectCommunityIdAndAddressName(userElement.getCommunityId(), e.getPhase(), e.getBuilding(), e.getUnit(), e.getLevel(), e.getRoomNo());
+                TpRoomNo tpRoomNo = tpRoomNoMapper.selectCommunityIdAndAddressName(userElement.getOrgId(), e.getPhase(), e.getBuilding(), e.getUnit(), e.getLevel(), e.getRoomNo());
                 if (null == tpRoomNo) {
                     throw new WisdomException("房产：" + e.getPhase() + e.getBuilding() + e.getUnit() + e.getLevel() + e.getRoomNo() + " 不存在！请核对！");
                 }
@@ -347,7 +348,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 billInvoice.setBillInvoiceExplain(e.getBillExplain());
                 billInvoice.setPayPrice(e.getPayPrice());
                 billInvoice.setBillStatus("0");
-                billInvoice.setCreateUser(userElement.getId());
+                billInvoice.setCreateUser(userElement.getUserId());
                 billInvoice.setCreateDate(new Date());
                 billInvoice.setStatus(1);
 
@@ -363,7 +364,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
                         // 往APP端用户上面的每一个用户推送
                         Message messageModelAPP = new Message();
-                        messageModelAPP.setCommunityId(userElement.getCommunityId());
+                        messageModelAPP.setCommunityId(userElement.getOrgId());
                         messageModelAPP.setMessageType("7");
                         messageModelAPP.setAdviceType("1");
                         messageModelAPP.setModelType("2");
@@ -374,7 +375,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                         messageModelAPP.setMessageContent("您有待缴费的账单，点击查看并缴费 " + dateFormat.format(new Date()) + bill.getBillName());
                         messageModelAPP.setStatus("1");
                         messageModelAPP.setCreateDate(LocalDateTime.now());
-                        messageModelAPP.setCreateUser(userElement.getId());
+                        messageModelAPP.setCreateUser(userElement.getUserId());
                         messageModelAPP.setBillId(e.getId());
 
                         return messageModelAPP;
@@ -513,7 +514,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     }
 
     @Override
-    public ResponseBean updateBillStatus(UserElement userElement, Integer billStatus, Integer id) {
+    public ResponseBean updateBillStatus(TaUser userElement, Integer billStatus, Integer id) {
         ResponseBean responseBean = new ResponseBean();
         Bill bill = billMapper.selectById(id);
         if (null == bill) {
@@ -527,7 +528,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     }
 
     @Override
-    public ResponseBean deleteBillBeach(UserElement userElement, List<Integer> ids) {
+    public ResponseBean deleteBillBeach(TaUser userElement, List<Integer> ids) {
         ResponseBean responseBean = new ResponseBean();
         ids.forEach(e -> {
             Bill bill = billMapper.selectById(e);
@@ -542,7 +543,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
             // 发布时消息为无效
             QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("community_id", userElement.getCommunityId());
+            queryWrapper.eq("community_id", userElement.getOrgId());
             queryWrapper.eq("message_type", "7");
             queryWrapper.eq("model_type", "2");
             queryWrapper.eq("source", "2");
@@ -553,7 +554,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             messages.forEach(message-> {
                 message.setStatus("0");
                 message.setUpdateDate(LocalDateTime.now());
-                message.setUpdateUser(userElement.getId());
+                message.setUpdateUser(userElement.getUserId());
                 messageMapper.updateById(message);
             });
 
@@ -598,7 +599,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     }
 
     @Override
-    public ResponseBean downloadExcel(UserElement userElement) {
+    public ResponseBean downloadExcel(TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         InputStream inputStream = null;
@@ -621,9 +622,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         Integer pageSize = 10;
         // 分页查询
 
-        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getCommunityId(), pageNum * pageSize, pageSize);
+        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), pageNum * pageSize, pageSize);
         // 总页数
-        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getCommunityId());
+        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId());
 
 
         // 行数 默认从 第 6 行开始
@@ -652,7 +653,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 if (index == records.size()) {
                     index = 0;
                     pageNum ++;
-                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getCommunityId(), pageNum * pageSize, pageSize);
+                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), pageNum * pageSize, pageSize);
                 }
                 if (records.isEmpty()) {
                     break;

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.BillInvoiceMapper;
 import com.huiju.estateagents.property.dao.BillStatementMapper;
@@ -45,7 +46,7 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
     private BillInvoiceMapper billInvoiceMapper;
 
     @Override
-    public ResponseBean getBillStatement(UserElement userElement, String parameter) {
+    public ResponseBean getBillStatement(TaUser userElement, String parameter) {
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
 
@@ -69,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.getCommunityId());
+        map.put("communityId", userElement.getOrgId());
 
         Page<TpBillOrder> page = new Page<>();
         page.setCurrent(pageNum);
@@ -117,7 +118,7 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
     }
 
     @Override
-    public ResponseBean exportExcel(UserElement userElement) {
+    public ResponseBean exportExcel(TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         String [] title = new String[] { "流水号","收费组编号","收费组名称","收费单号","费用金额","缴费人","缴费备注","缴费方式","流水生成时间"};
 
@@ -132,7 +133,7 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
      * @param workbook
      * @return
      */
-    private HSSFWorkbook excel(String[] title, UserElement userElement, HSSFWorkbook workbook) {
+    private HSSFWorkbook excel(String[] title, TaUser userElement, HSSFWorkbook workbook) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
         if (null == workbook) {
@@ -159,7 +160,7 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
         }
 
         Map<String, Object> map = Maps.newHashMap();
-        map.put("communityId", userElement.getCommunityId());
+        map.put("communityId", userElement.getOrgId());
 
         Page<BillStatement> page = new Page<>();
         page.setCurrent(1);

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
@@ -104,13 +105,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
     @Override
-    public ResponseBean listQuery(String parameter, UserElement userElement) {
+    public ResponseBean listQuery(String parameter, TaUser userElement) {
 
         ResponseBean responseBean = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         TpBuildingOwnerInfo tpBuildingOwnerInfo = jsonObject.toJavaObject(jsonObject,TpBuildingOwnerInfo.class);
-        tpBuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
+        tpBuildingOwnerInfo.setCommunityId(userElement.getOrgId());
         Long pageNum = jsonObject.getLong("pageNum") == null ? 1 : jsonObject.getLong("pageNum");
         Long pageSize = jsonObject.getLong("pageSize") == null ? 10 : jsonObject.getLong("pageSize");
 
@@ -134,7 +135,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean update(String parameter, UserElement userElement) {
+    public ResponseBean update(String parameter, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         // 审核id
@@ -175,7 +176,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         // 审核通过后，往楼栋资料库添加数据
 //        if ("1".equals(verify)) {
 //            TpBuildingOwnerInfo tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
-//                    userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getCommunityId(), userElement.getId(),
+//                    userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getOrgId(), userElement.getUserId(),
 //                    userVerify.getGender(), user.getUserName(), user.getLoginName());
 //
 //            // 设置审核id
@@ -191,7 +192,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean add(String parameter, UserElement userElement) {
+    public ResponseBean add(String parameter, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(parameter);
@@ -199,7 +200,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Integer roleId = jsonObject.getInteger("roleId");
         TpBuildingOwnerInfo tpBuildingOwnerInfo = jsonObject.toJavaObject(TpBuildingOwnerInfo.class);
         // 物业端的用户,也就是正在操作的物业人员
-        User user = userMapper.selectById(userElement.getId());
+        User user = userMapper.selectById(userElement.getUserId());
 
         /**
          * 允许有多个手机号，一个业主允许在小区允许有多套房产
@@ -207,7 +208,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
          */
 
         // 校验楼栋信息表
-        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, userElement.getCommunityId());
+        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, userElement.getOrgId());
         if (null != selectBuild) {
             responseBean.addError("该户号，此人员信息已存在!");
             return responseBean;
@@ -222,31 +223,31 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             taUser = new TaUser();
             taUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
             taUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
-            taUser.setGender(tpBuildingOwnerInfo.getGender());
-            taUser.setStatus("1");
-            taUser.setRemark("系统自动注册！");
-            taUser.setAcceptAgreementStatus("1");
-            taUser.setVerifyStatus("1");
-//            taUserMapper.insert(taUser);
-            taUser.setCreateUser(taUser.getId());
+//            taUser.setGender(tpBuildingOwnerInfo.getGender());
+//            taUser.setStatus("1");
+//            taUser.setRemark("系统自动注册！");
+//            taUser.setAcceptAgreementStatus("1");
+//            taUser.setVerifyStatus("1");
+////            taUserMapper.insert(taUser);
+//            taUser.setCreateUser(taUser.getId());
             taUser.setCreateDate(LocalDateTime.now());
 //            taUserMapper.updateById(taUser);
             appUser = taUser;
         }
 
         // 设置 用户性别 和 用户姓名
-        tpBuildingOwnerInfo.setGender(appUser.getGender());
+//        tpBuildingOwnerInfo.setGender(appUser.getGender());
         tpBuildingOwnerInfo.setOwnerName(appUser.getUserName());
 
         // 插入楼栋资料库
         tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
-                tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), userElement.getCommunityId(), userElement.getId(),
+                tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), userElement.getOrgId(), userElement.getUserId(),
                 tpBuildingOwnerInfo.getGender(), tpBuildingOwnerInfo.getOwnerName(), tpBuildingOwnerInfo.getOwnerTel());
 
         // 更新 APP 端用户姓名
         appUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
         appUser.setCreateDate(LocalDateTime.now());
-        appUser.setCreateUser(appUser.getId());
+//        appUser.setCreateUser(appUser.getId());
 
 //        int row = taUserMapper.updateById(appUser);
 //        if (row <= 0) {
@@ -266,7 +267,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 //        }
 
         // 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
-        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getCommunityId(), tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(), tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId());
+        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getOrgId(), tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(), tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId());
         if (null != userVerify && roleId.intValue() == 1) {
             responseBean.addSuccess("已存在业主！");
             return responseBean;
@@ -274,8 +275,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 审核表中插入一条数据, 审核已通过，并且是业主角色
         TaUserVerify taUserVerify = new TaUserVerify();
-        taUserVerify.setUserId(appUser.getId());
-        taUserVerify.setCommunityId(userElement.getCommunityId());
+//        taUserVerify.setUserId(appUser.getId());
+        taUserVerify.setCommunityId(userElement.getOrgId());
         taUserVerify.setRoleId(roleId);
         taUserVerify.setPhaseId(tpBuildingOwnerInfo.getPhaseId());
         taUserVerify.setPhaseName(tpBuildingOwnerInfo.getPhaseName());
@@ -311,7 +312,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             message.setResult("");
             message.setMeaasgeTypeId("");
             message.setReadStatus("0");
-            message.setCreateUser(userElement.getId());
+            message.setCreateUser(userElement.getUserId());
             message.setCreateDate(LocalDateTime.now());
             messageMapper.insert(message);
         }
@@ -435,7 +436,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean submitExcelData(MultipartFile file, UserElement userElement) {
+    public ResponseBean submitExcelData(MultipartFile file, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = getExcelData(file);
 
@@ -464,12 +465,12 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         return responseBean;
     }
     
-    private void checkUserVerify(TaUser taUser, TpBuildingOwnerInfo tpBuildingOwnerInfo, UserElement userElement) {
+    private void checkUserVerify(TaUser taUser, TpBuildingOwnerInfo tpBuildingOwnerInfo, TaUser userElement) {
 
         //有用户的情况下查看是否有申请的房产
         QueryWrapper<TaUserVerify> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("community_id",userElement.getCommunityId());
-        queryWrapper.eq("user_id",taUser.getId());
+        queryWrapper.eq("community_id",userElement.getOrgId());
+        queryWrapper.eq("user_id",taUser.getUserId());
         List<TaUserVerify> verifyList = taUserVerifyMapper.selectList(queryWrapper);
         AtomicInteger rows = new AtomicInteger();
         if (verifyList.size() > 0){
@@ -492,7 +493,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         }
         //插入一条房产数据
-        saveVerifyData(taUser.getId(),tpBuildingOwnerInfo,userElement);
+        saveVerifyData(taUser.getUserId(),tpBuildingOwnerInfo,userElement);
     }
     
     /**
@@ -500,24 +501,24 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * @param tpBuildingOwnerInfo
      * @param userElement
      */
-    private void addNewUser(TpBuildingOwnerInfo tpBuildingOwnerInfo, UserElement userElement) {
+    private void addNewUser(TpBuildingOwnerInfo tpBuildingOwnerInfo, TaUser userElement) {
         //插入用户
         TaUser taUser = new TaUser();
         taUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
         taUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
-        taUser.setStatus("1");
+//        taUser.setStatus("1");
         taUser.setCreateDate(LocalDateTime.now());
-        taUser.setFaceStatus("0");
+//        taUser.setFaceStatus("0");
 //        taUserMapper.insert(taUser);
         //审核通过
-        saveVerifyData(taUser.getId(),tpBuildingOwnerInfo,userElement);
+        saveVerifyData(taUser.getUserId(),tpBuildingOwnerInfo,userElement);
         
     }
     
-    private void saveVerifyData(Integer userId, TpBuildingOwnerInfo tpBuildingOwnerInfo, UserElement userElement) {
+    private void saveVerifyData(Integer userId, TpBuildingOwnerInfo tpBuildingOwnerInfo, TaUser userElement) {
         TaUserVerify taUserVerify = new TaUserVerify();
         taUserVerify.setUserId(userId);
-        taUserVerify.setCommunityId(userElement.getCommunityId());
+        taUserVerify.setCommunityId(userElement.getOrgId());
         if (tpBuildingOwnerInfo.getRoleName().equals("户主")){
             taUserVerify.setRoleId(1);
         }else if (tpBuildingOwnerInfo.getRoleName().equals("家属")){
@@ -527,7 +528,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
         // 只允许一个房产中只有一个角色
-        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectUserVerifyCommunityAndAddress(userId, userElement.getCommunityId(), tpBuildingOwnerInfo.getPhaseId(),
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectUserVerifyCommunityAndAddress(userId, userElement.getOrgId(), tpBuildingOwnerInfo.getPhaseId(),
                 tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
                 tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), 1);
         // 表示这个用户在这个房产中已经有了这个角色, 就不进行插入
@@ -537,7 +538,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 校验这个房产有没有业主，只能存在一个业主
         if (taUserVerify.getRoleId().intValue() == 1) {
-            TaUserVerify hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getCommunityId(), tpBuildingOwnerInfo.getPhaseId(),
+            TaUserVerify hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getOrgId(), tpBuildingOwnerInfo.getPhaseId(),
                     tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
                     tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId());
             if (null != hasUserVerify) {
@@ -565,13 +566,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
 
         // 通过后，需要往楼栋资料库写入数据
-        tpBuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
+        tpBuildingOwnerInfo.setCommunityId(userElement.getOrgId());
 //        tpBuildingOwnerInfo.setIdCard(taUser.getIdCard());
 //        tpBuildingOwnerInfo.setGender(taUser.getGender());
         tpBuildingOwnerInfo.setPairStatus("1");
         tpBuildingOwnerInfo.setVerifyStatus("1");
         tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
-        tpBuildingOwnerInfo.setCreateUser(userElement.getId());
+        tpBuildingOwnerInfo.setCreateUser(userElement.getUserId());
         tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
 
         tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
@@ -864,7 +865,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public ResponseBean buildinglist(String paramets, UserElement userElement) {
+    public ResponseBean buildinglist(String paramets, TaUser userElement) {
         ResponseBean responseBean= new ResponseBean();
 
         TpBuilding   tpBuilding= JSONObject.parseObject(paramets, TpBuilding.class);
@@ -945,7 +946,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public ResponseBean downloadExcel(UserElement userElement) {
+    public ResponseBean downloadExcel(TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         InputStream inputStream = null;
@@ -968,9 +969,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Integer pageSize = 10;
 
         // 分页查询
-        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getCommunityId(),pageNum * pageSize, pageSize);
+        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(),pageNum * pageSize, pageSize);
         // 总页数
-        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getCommunityId());
+        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId());
 
 
         // 行数 默认从 第 3 行开始
@@ -1019,7 +1020,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 if (index == records.size()) {
                     index = 0;
                     pageNum ++;
-                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getCommunityId(),pageNum * pageSize, pageSize);
+                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(),pageNum * pageSize, pageSize);
                 }
                 if (records.isEmpty()) {
                     break;
@@ -1128,7 +1129,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public ResponseBean buildingDetails(String paramets, UserElement userElement) {
+    public ResponseBean buildingDetails(String paramets, TaUser userElement) {
         ResponseBean response= new ResponseBean();
         JSONObject object= JSONObject.parseObject(paramets);
         Integer id= object.getInteger("id");

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.*;
@@ -162,7 +163,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	 * @return
 	 */
 	@Override
-	public ResponseBean submitExcelData(MultipartFile file, UserElement userElement) {
+	public ResponseBean submitExcelData(MultipartFile file, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		responseBean = getExcelData(file);
 //		if (!responseBean.getCode().equals(Constant.RESPONSE_SUCCESS)){
@@ -173,7 +174,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
 		
 		//入库
-		Integer communityId = userElement.getCommunityId();
+		Integer communityId = userElement.getOrgId();
 		
 		//保存数据到表中--拆分数据
 		saveBuildingTreeData(communityId,list);

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.model.*;
@@ -81,12 +82,12 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
     }
 
     @Override
-    public ResponseBean hotelRoomAdd(String parameter, UserElement userElement) {
+    public ResponseBean hotelRoomAdd(String parameter, TaUser userElement) {
         ResponseBean response= new ResponseBean<>();
         HotelRoom hotelRoom= JSONObject.parseObject(parameter, HotelRoom.class);
         // 查询当前房间名称是否重复
         QueryWrapper<HotelRoom> HotelRoomName= new QueryWrapper<>();
-        HotelRoomName.eq("community_id",userElement.getCommunityId());
+        HotelRoomName.eq("community_id",userElement.getOrgId());
         HotelRoomName.eq("room_name",hotelRoom.getRoomName());
         List<HotelRoom> roomName= tpHotelRoomMapper.selectList(HotelRoomName);
         if (null != roomName && roomName.size()>0){
@@ -95,7 +96,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         }
         // 查询当前房间编号是否重复
 //        QueryWrapper<HotelRoom> HotelRoomQuery= new QueryWrapper<>();
-//        HotelRoomQuery.eq("community_id",userElement.getCommunityId());
+//        HotelRoomQuery.eq("community_id",userElement.getOrgId());
 //        HotelRoomQuery.eq("room_no",hotelRoom.getRoomNo());
 //        List<HotelRoom> RoomNo= tpHotelRoomMapper.selectList(HotelRoomQuery);
 //        if (null != RoomNo && RoomNo.size()>0){
@@ -107,21 +108,21 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
             response.addError("请输入房间价格");
             return response;
         }
-        Hotel hotel= tpHotelMapper.selectHotel(userElement.getCommunityId());
-        hotelRoom.setCommunityId(userElement.getCommunityId())
+        Hotel hotel= tpHotelMapper.selectHotel(userElement.getOrgId());
+        hotelRoom.setCommunityId(userElement.getOrgId())
                 .setHotelId(hotel.getId())
                 .setPrice(String.valueOf(hotelRoom.getPrice()))
                 .setCreateDate(LocalDateTime.now())
-                .setCreateUser(userElement.getId())
+                .setCreateUser(userElement.getUserId())
                 .setUpdateDate(LocalDateTime.now())
-                .setUpdateUser(userElement.getId());
+                .setUpdateUser(userElement.getUserId());
         tpHotelRoomMapper.insert(hotelRoom);
         response.addSuccess("成功");
         return response;
     }
 
     @Override
-    public ResponseBean hotelRoomEdit(String parameter, UserElement userElement) {
+    public ResponseBean hotelRoomEdit(String parameter, TaUser userElement) {
             ResponseBean response= new ResponseBean<>();
             HotelRoom hotelRoom= JSONObject.parseObject(parameter, HotelRoom.class);
             // 判断价格是否存在
@@ -129,19 +130,19 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
                 response.addError("请输入房间价格");
                 return response;
             }
-            Hotel hotel= tpHotelMapper.selectHotel(userElement.getCommunityId());
-            hotelRoom.setCommunityId(userElement.getCommunityId())
+            Hotel hotel= tpHotelMapper.selectHotel(userElement.getOrgId());
+            hotelRoom.setCommunityId(userElement.getOrgId())
                     .setHotelId(hotel.getId())
                     .setPrice(String.valueOf(hotelRoom.getPrice()))
                     .setUpdateDate(LocalDateTime.now())
-                    .setUpdateUser(userElement.getId());
+                    .setUpdateUser(userElement.getUserId());
             tpHotelRoomMapper.updateById(hotelRoom);
             response.addSuccess("成功");
             return response;
         }
 
     @Override
-    public ResponseBean hotelRoomRoomStatus(String parameter, UserElement userElement) {
+    public ResponseBean hotelRoomRoomStatus(String parameter, TaUser userElement) {
         ResponseBean responseBean= new ResponseBean<>();
         JSONObject object= JSONObject.parseObject(parameter);
         JSONArray arr= object.getJSONArray("id");
@@ -151,7 +152,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
             HotelRoom hotelRoom= tpHotelRoomMapper.selectById(id);
             hotelRoom.setRoomStatus(roomStatus);
             hotelRoom.setUpdateDate(LocalDateTime.now());
-            hotelRoom.setUpdateUser(userElement.getId());
+            hotelRoom.setUpdateUser(userElement.getUserId());
             tpHotelRoomMapper.updateById(hotelRoom);
             responseBean.addSuccess("成功");
         }
@@ -166,14 +167,14 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
      * @return
      */
     @Override
-    public Hotel getHotelData(UserElement userElement) {
+    public Hotel getHotelData(TaUser userElement) {
         QueryWrapper<Hotel> hotelQueryWrapper = new QueryWrapper<>();
-        hotelQueryWrapper.eq("community_id",userElement.getCommunityId());
+        hotelQueryWrapper.eq("community_id",userElement.getOrgId());
         Hotel hotel = tpHotelMapper.selectOne(hotelQueryWrapper);
         if (null != hotel){
             //查看酒店开关是否开启
             QueryWrapper<HotelSetting> hotelSettingQueryWrapper = new QueryWrapper<>();
-            hotelSettingQueryWrapper.eq("community_id",userElement.getCommunityId());
+            hotelSettingQueryWrapper.eq("community_id",userElement.getOrgId());
             HotelSetting hotelSetting = hotelSettingMapper.selectOne(hotelSettingQueryWrapper);
             hotel.setHotelSettingValue(null == hotelSetting ? false : true);
             QueryWrapper<TpHotelImg> imgQueryWrapper = new QueryWrapper<>();
@@ -205,7 +206,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
      * @return
      */
     @Override
-    public ResponseBean addHotel(Hotel hotel, UserElement userElement) {
+    public ResponseBean addHotel(Hotel hotel, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         if (StringUtils.isBlank(hotel.getHotelLongitude()) || StringUtils.isBlank(hotel.getHotelLatitude())) {
             responseBean.addError("地理坐标不能为空！");
@@ -214,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.getCommunityId());
+            hotelSettingQuery.eq("community_id",userElement.getOrgId());
             HotelSetting communitySetting= hotelSettingMapper.selectOne(hotelSettingQuery);
             if (null == communitySetting) {
                 HotelSetting hotelSetting = new HotelSetting();
-                hotelSetting.setCommunityId(userElement.getCommunityId());
+                hotelSetting.setCommunityId(userElement.getOrgId());
                 hotelSetting.setCreateDate(LocalDateTime.now());
-                hotelSetting.setCreateUser(userElement.getId());
+                hotelSetting.setCreateUser(userElement.getUserId());
                 hotelSettingMapper.insert(hotelSetting);
             }
         }else {
             QueryWrapper<HotelSetting> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("community_id",userElement.getCommunityId());
+            queryWrapper.eq("community_id",userElement.getOrgId());
             hotelSettingMapper.delete(queryWrapper);
         }
         if (null != hotel.getId()){
@@ -237,21 +238,21 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         return responseBean;
     }
     
-    private void updateHotel(Hotel hotel, UserElement userElement) {
+    private void updateHotel(Hotel hotel, TaUser userElement) {
         hotel.setUpdateDate(LocalDateTime.now());
-        hotel.setUpdateUser(userElement.getId());
+        hotel.setUpdateUser(userElement.getUserId());
         tpHotelMapper.updateById(hotel);
         //更新首页图
         TpHotelImg tpHotelImg = new TpHotelImg();
         tpHotelImg.setImgUrl(hotel.getAppIndexImg());
         QueryWrapper<TpHotelImg> tpHotelImgQueryWrapper = new QueryWrapper();
-        tpHotelImgQueryWrapper.eq("community_id",userElement.getCommunityId());
+        tpHotelImgQueryWrapper.eq("community_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.getCommunityId());
+        deleteImgQueryWrapper.eq("community_id",userElement.getOrgId());
         deleteImgQueryWrapper.eq("hotel_id",hotel.getId());
         deleteImgQueryWrapper.eq("img_type","2");
         hotelImgMapper.delete(deleteImgQueryWrapper);
@@ -259,14 +260,14 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         batchInsertImg(hotel,userElement);
     }
     
-    private void addFirstHotel(Hotel hotel, UserElement userElement) {
-        hotel.setCommunityId(userElement.getCommunityId());
+    private void addFirstHotel(Hotel hotel, TaUser userElement) {
+        hotel.setCommunityId(userElement.getOrgId());
         hotel.setCreateDate(LocalDateTime.now());
-        hotel.setCreateUser(userElement.getId());
+        hotel.setCreateUser(userElement.getUserId());
         tpHotelMapper.insert(hotel);
         //添加首页图
         TpHotelImg tpHotelImg = new TpHotelImg();
-        tpHotelImg.setCommunityId(userElement.getCommunityId());
+        tpHotelImg.setCommunityId(userElement.getOrgId());
         tpHotelImg.setCreateDate(LocalDateTime.now());
         tpHotelImg.setHotelId(hotel.getId());
         tpHotelImg.setImgType("1");
@@ -276,12 +277,12 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         batchInsertImg(hotel,userElement);
     }
     
-    private void batchInsertImg(Hotel hotel, UserElement userElement) {
+    private void batchInsertImg(Hotel hotel, TaUser userElement) {
         List<String> imgList = hotel.getAppCarouselImg();
         List<TpHotelImg> hotelImgList = new ArrayList<>();
         imgList.stream().forEach(e -> {
             TpHotelImg hotelImg = new TpHotelImg();
-            hotelImg.setCommunityId(userElement.getCommunityId());
+            hotelImg.setCommunityId(userElement.getOrgId());
             hotelImg.setCreateDate(LocalDateTime.now());
             hotelImg.setHotelId(hotel.getId());
             hotelImg.setImgType("2");

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.property.service.impl;
 
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.IndexCountMapper;
 import com.huiju.estateagents.property.model.*;
@@ -32,9 +33,9 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 	 * @return
 	 */
 	@Override
-	public Map<String, Object> getIndexCount(UserElement userElement) {
+	public Map<String, Object> getIndexCount(TaUser userElement) {
 		Map<String,Object> map = new HashMap<>();
-		Integer communityId = userElement.getCommunityId();
+		Integer communityId = userElement.getOrgId();
 		
 		//历史工单统计和今日工单统计
 		Map<String,Object> ticketMap = getTicketMap(communityId);

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.RoleMapper;
 import com.huiju.estateagents.property.dao.SysRoleMenuMapper;
@@ -50,13 +51,13 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	 * @return
 	 */
 	@Override
-	public ResponseBean getRoleList(String roleName, UserElement userElement, Integer pageNum, Integer pageSize) {
+	public ResponseBean getRoleList(String roleName, TaUser userElement, Integer pageNum, Integer pageSize) {
 		ResponseBean responseBean = new ResponseBean();
 		Page page = new Page(pageNum,pageSize);
 		// 分页查询
 		SysRole role = new SysRole();
 		role.setRoleName(roleName);
-		role.setCommunityId(userElement.getCommunityId());
+		role.setCommunityId(userElement.getOrgId());
 		List<SysRole> list = roleMapper.getRoleListByParams(page,role);
 		Map<String, Object> map = Maps.newHashMap();
 		map.put("list",list);
@@ -73,16 +74,16 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	 * @return
 	 */
 	@Override
-	public ResponseBean addRole(SysRole sysRole, UserElement userElement) {
+	public ResponseBean addRole(SysRole sysRole, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		//接收数据
-		sysRole.setCommunityId(userElement.getCommunityId());
-		Integer userId = userElement.getId();
+		sysRole.setCommunityId(userElement.getOrgId());
+		Integer userId = userElement.getUserId();
 		LocalDateTime dateTime = LocalDateTime.now();
 		sysRole.setCreateUser(userId);
 		sysRole.setCreateDate(dateTime);
 		//校验角色名不能相同
-		SysRole checkSysRole = roleMapper.selectByRoleName(sysRole.getRoleName(),userElement.getCommunityId());
+		SysRole checkSysRole = roleMapper.selectByRoleName(sysRole.getRoleName(),userElement.getOrgId());
 		if (null != checkSysRole){
 			responseBean.addError("存在重复的角色名称");
 			return responseBean;
@@ -125,7 +126,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	 * @return
 	 */
 	@Override
-	public ResponseBean getRoleInfo(Integer id, UserElement userElement) {
+	public ResponseBean getRoleInfo(Integer id, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		//查询出这条角色信息
 		SysRole sysRole = roleMapper.selectById(id);
@@ -151,14 +152,14 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	 * @return
 	 */
 	@Override
-	public ResponseBean updateRole(SysRole sysRole, UserElement userElement) {
+	public ResponseBean updateRole(SysRole sysRole, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		//接收数据
-		sysRole.setCommunityId(userElement.getCommunityId());
-		sysRole.setUpdateUser(userElement.getId());
+		sysRole.setCommunityId(userElement.getOrgId());
+		sysRole.setUpdateUser(userElement.getUserId());
 		sysRole.setUpdateDate(LocalDateTime.now());
 		//校验角色名不能相同
-		SysRole checkSysRole = roleMapper.selectByRoleName(sysRole.getRoleName(),userElement.getCommunityId());
+		SysRole checkSysRole = roleMapper.selectByRoleName(sysRole.getRoleName(),userElement.getOrgId());
 		if (null != checkSysRole && !checkSysRole.getId().equals(sysRole.getId())){
 			responseBean.addError("存在重复的角色名称");
 			return responseBean;
@@ -193,7 +194,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	 * @return
 	 */
 	@Override
-	public ResponseBean deleteRole(SysRole sysRole, UserElement userElement) {
+	public ResponseBean deleteRole(SysRole sysRole, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		List<Integer> sysRoleIdList = sysRole.getIdArray();
 		//删除角色
@@ -206,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.getCommunityId());
+			queryWrapper.eq("community_id", userElement.getOrgId());
 			sysRoleMenuMapper.delete(queryWrapper);
 
 			// 删除角色和用户关系
 			QueryWrapper<SysUserRole> deleteQueryWrapper = new QueryWrapper<>();
 			deleteQueryWrapper.eq("role_id", roleId);
-			deleteQueryWrapper.eq("community_id", userElement.getCommunityId());
+			deleteQueryWrapper.eq("community_id", userElement.getOrgId());
 			sysUserRoleMapper.delete(deleteQueryWrapper);
 		});
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.TaUserLicenseOrderMapper;
 import com.huiju.estateagents.property.model.TaUserLicenseOrder;
@@ -37,7 +38,7 @@ public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrde
     private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
 
     @Override
-    public ResponseBean getAll(Integer id, String licensePlate, String orderNumber, String paymentName, String paymentTel, Integer pageNum, Integer pageSize, UserElement userElement) {
+    public ResponseBean getAll(Integer id, String licensePlate, String orderNumber, String paymentName, String paymentTel, Integer pageNum, Integer pageSize, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaUserLicenseOrder> page = new Page<>();
         page.setSize(pageSize);
@@ -48,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.getCommunityId());
+        queryWrapper.eq("community_id", userElement.getOrgId());
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaUserLicenseOrder> orderIPage = this.page(page, queryWrapper);
@@ -57,13 +58,13 @@ public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrde
     }
 
     @Override
-    public ResponseBean exportDate(UserElement userElement) {
+    public ResponseBean exportDate(TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         Integer pageNum = 0;
         Integer pageSize = 10;
         Integer count = 0;
-        count = taUserLicenseOrderMapper.getCount(userElement.getCommunityId());
-        List<TaUserLicenseOrder> licensePage = taUserLicenseOrderMapper.getLicensePage(userElement.getCommunityId(), pageNum * pageSize, pageSize);
+        count = taUserLicenseOrderMapper.getCount(userElement.getOrgId());
+        List<TaUserLicenseOrder> licensePage = taUserLicenseOrderMapper.getLicensePage(userElement.getOrgId(), pageNum * pageSize, pageSize);
 
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet();
@@ -125,7 +126,7 @@ public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrde
                 if (listIndex == licensePage.size()) {
                     listIndex = 0;
                     pageNum ++;
-                    licensePage = taUserLicenseOrderMapper.getLicensePage(userElement.getCommunityId(), pageNum * pageSize, pageSize);
+                    licensePage = taUserLicenseOrderMapper.getLicensePage(userElement.getOrgId(), pageNum * pageSize, pageSize);
                 }
                 if (licensePage.isEmpty()) {
                     break;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
@@ -60,14 +61,14 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     private MessageMapper tpmessageMapper;
 
     @Override
-    public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize, UserElement userElement) {
+    public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         Page<TaUserVerify> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
 
-        IPage<TaUserVerify> userVerifyIPage = taUserVerifyMapper.selectAllByPhoneAndUserNameAndIdCard(page, phone, userName, idCard, userElement.getCommunityId());
+        IPage<TaUserVerify> userVerifyIPage = taUserVerifyMapper.selectAllByPhoneAndUserNameAndIdCard(page, phone, userName, idCard, userElement.getOrgId());
         responseBean.addSuccess(userVerifyIPage);
 
         return responseBean;
@@ -75,7 +76,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean auditUser(UserElement userElement, Integer userVerifyId, Boolean verifyStatus, String remark) {
+    public ResponseBean auditUser(TaUser userElement, Integer userVerifyId, Boolean verifyStatus, String remark) {
         ResponseBean responseBean = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
@@ -95,7 +96,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         // 校验房产
         hasUserVerify(userElement, userVerify, true);
 
-        User user = userMapper.selectById(userElement.getId());
+        User user = userMapper.selectById(userElement.getUserId());
 
 
 //        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
@@ -131,7 +132,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             message.setResult("");
             message.setMeaasgeTypeId("");
             message.setReadStatus("0");
-            message.setCreateUser(userElement.getId());
+            message.setCreateUser(userElement.getUserId());
             message.setCreateDate(LocalDateTime.now());
             tpmessageMapper.insert(message);
         }
@@ -146,11 +147,11 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
      * @param userVerify
      * @param hasOwner 是否执行业主校验
      */
-    private void hasUserVerify(UserElement userElement, TaUserVerify userVerify, boolean hasOwner){
+    private void hasUserVerify(TaUser userElement, TaUserVerify userVerify, boolean hasOwner){
         TaUserVerify hasUserVerify = null;
         // 校验这个房产有没有业主，只能存在一个业主
         if (hasOwner && userVerify.getRoleId().intValue() == 1 && "1".equals(userVerify.getVerifyStatus())) {
-            hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getCommunityId(), userVerify.getPhaseId(),
+            hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getOrgId(), userVerify.getPhaseId(),
                     userVerify.getBuildingId(), userVerify.getUnitId(),
                     userVerify.getLevelId(), userVerify.getRoomNoId());
             if (null != hasUserVerify) {
@@ -209,7 +210,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean verifyinfoAdd(UserElement userElement, Integer userVerifyId, String verifyStatus, String roleState, String remark) {
+    public ResponseBean verifyinfoAdd(TaUser userElement, Integer userVerifyId, String verifyStatus, String roleState, String remark) {
         ResponseBean responseBean = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
@@ -228,7 +229,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         // 被审核的用户(APP端)
 //        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
         // 物业人员
-        User user = userMapper.selectById(userElement.getId());
+        User user = userMapper.selectById(userElement.getUserId());
         TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getCommunityId(), userVerify.getPhaseId(),
                 userVerify.getBuildingId(), userVerify.getUnitId(),
                 userVerify.getLevelId(), userVerify.getRoomNoId(),
@@ -269,7 +270,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             message.setResult("");
             message.setMeaasgeTypeId("");
             message.setReadStatus("0");
-            message.setCreateUser(userElement.getId());
+            message.setCreateUser(userElement.getUserId());
             message.setCreateDate(LocalDateTime.now());
             tpmessageMapper.insert(message);
         }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.property.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.TaVisitorLicenseSettingMapper;
 import com.huiju.estateagents.property.model.TaVisitorLicenseSetting;
@@ -23,11 +24,11 @@ import java.time.LocalDateTime;
 public class TaVisitorLicenseSettingServiceImpl extends ServiceImpl<TaVisitorLicenseSettingMapper, TaVisitorLicenseSetting> implements ITaVisitorLicenseSettingService {
 
     @Override
-    public ResponseBean saveOrDelete(UserElement userElement, Boolean visitorLicenseBool) {
+    public ResponseBean saveOrDelete(TaUser userElement, Boolean visitorLicenseBool) {
         ResponseBean responseBean = new ResponseBean();
 
         QueryWrapper<TaVisitorLicenseSetting> visitorLicenseSettingQueryWrapper = new QueryWrapper<>();
-        visitorLicenseSettingQueryWrapper.eq("community_id", userElement.getCommunityId());
+        visitorLicenseSettingQueryWrapper.eq("community_id", userElement.getOrgId());
         TaVisitorLicenseSetting taVisitorLicenseSetting = this.getOne(visitorLicenseSettingQueryWrapper);
 
         // true 表示开启访客邀请车辆
@@ -37,9 +38,9 @@ public class TaVisitorLicenseSettingServiceImpl extends ServiceImpl<TaVisitorLic
                 return responseBean;
             }
             TaVisitorLicenseSetting visitorLicenseSetting = new TaVisitorLicenseSetting();
-            visitorLicenseSetting.setCommunityId(userElement.getCommunityId());
+            visitorLicenseSetting.setCommunityId(userElement.getOrgId());
             visitorLicenseSetting.setCreateDate(LocalDateTime.now());
-            visitorLicenseSetting.setCreateUser(userElement.getId());
+            visitorLicenseSetting.setCreateUser(userElement.getUserId());
 
             this.save(visitorLicenseSetting);
 
@@ -56,11 +57,11 @@ public class TaVisitorLicenseSettingServiceImpl extends ServiceImpl<TaVisitorLic
     }
 
     @Override
-    public ResponseBean getVisitorLicense(UserElement userElement) {
+    public ResponseBean getVisitorLicense(TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         QueryWrapper<TaVisitorLicenseSetting> visitorLicenseSettingQueryWrapper = new QueryWrapper<>();
-        visitorLicenseSettingQueryWrapper.eq("community_id", userElement.getCommunityId());
+        visitorLicenseSettingQueryWrapper.eq("community_id", userElement.getOrgId());
         TaVisitorLicenseSetting visitorLicenseSetting = this.getOne(visitorLicenseSettingQueryWrapper);
         // true 表示启用了访客邀请的车辆， false 表示未启用访客邀请的车辆
         responseBean.addSuccess(null != visitorLicenseSetting ? true : false);

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.BeanTools;
 import com.huiju.estateagents.property.common.UserElement;
@@ -70,7 +71,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
     private TpActivitySignInMapper tpActivitySignInMapper;
 
     @Override
-    public ResponseBean listQuery(String parameter, UserElement userElement) {
+    public ResponseBean listQuery(String parameter, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(parameter);
@@ -87,7 +88,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         QueryWrapper<TpActivity> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(id != null && !"".equals(id),"id", id);
         queryWrapper.like(activityTitle != null && !"".equals(activityTitle),"activity_title", activityTitle);
-        queryWrapper.eq("community_id", userElement.getCommunityId());
+        queryWrapper.eq("community_id", userElement.getOrgId());
         queryWrapper.orderByDesc("sort","create_date");
 
         IPage<TpActivity> infoPage = tpActivityMapper.selectPage(page, queryWrapper);
@@ -122,7 +123,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean addActivity(String parameter, UserElement userElement) {
+    public ResponseBean addActivity(String parameter, TaUser userElement) {
 
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
@@ -165,9 +166,9 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         if (radio>0) {
             tpActivity.setSignInCode(radio+"");
         }
-        tpActivity.setCommunityId(userElement.getCommunityId());
+        tpActivity.setCommunityId(userElement.getOrgId());
         tpActivity.setCreateDate(LocalDateTime.now());
-        tpActivity.setCreateUser(userElement.getId());
+        tpActivity.setCreateUser(userElement.getUserId());
 
         int row = tpActivityMapper.insert(tpActivity);
 
@@ -180,18 +181,18 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
                 // 草稿时插入消息
                 Message activityMessage = new Message();
-            activityMessage.setCommunityId(userElement.getCommunityId());
+            activityMessage.setCommunityId(userElement.getOrgId());
             activityMessage.setMessageType("8");
             activityMessage.setAdviceType("4");
             activityMessage.setModelType("2");
-            activityMessage.setUuid(userElement.getId());
+            activityMessage.setUuid(userElement.getUserId());
             activityMessage.setUuidType("2");
             activityMessage.setSource("2");
             activityMessage.setMessageContent("活动“{" + tpActivity.getActivityTitle() + "}”还未发布，点击发布");
             activityMessage.setStatus("1");
             activityMessage.setActivityId(tpActivity.getId());
             activityMessage.setCreateDate(LocalDateTime.now());
-            activityMessage.setCreateUser(userElement.getId());
+            activityMessage.setCreateUser(userElement.getUserId());
             activityMessage.setReadStatus("0");
                 //为草稿时
                 if ("2".equals(tpActivity.getStatus())) {
@@ -205,7 +206,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
             if("1".equals(tpActivity.getStatus())) {
                 QueryWrapper<TaUser> queryWrapperTaUser = new QueryWrapper<>();
-                queryWrapperTaUser.eq("community_id",userElement.getCommunityId());
+                queryWrapperTaUser.eq("community_id",userElement.getOrgId());
 //                List<TaUser> userList= taUserMapper.selectList(queryWrapperTaUser);
 //                for (TaUser taUser:userList){
 //                    activityMessage.setUuid(taUser.getId());
@@ -216,7 +217,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
                 // 发布时消息为无效
 //                if ("1".equals(tpActivity.getStatus())) {
 //                    QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
-//                    queryWrapper.eq("community_id", userElement.getCommunityId());
+//                    queryWrapper.eq("community_id", userElement.getOrgId());
 //                    queryWrapper.eq("message_type", "8");
 //                    queryWrapper.eq("model_type", "2");
 //                    queryWrapper.eq("source", "2");
@@ -225,7 +226,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 //                    if (null != message) {
 //                        message.setStatus("0");
 //                        message.setUpdateDate(LocalDateTime.now());
-//                        message.setUpdateUser(userElement.getId());
+//                        message.setUpdateUser(userElement.getUserId());
 //                        messageMapper.updateById(message);
 //                    }
 //
@@ -241,7 +242,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
                         tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
                         tdImages.setUuid(tpActivity.getId());
                         tdImages.setType("activityCode");
-                        tdImages.setCreateUser(userElement.getId());
+                        tdImages.setCreateUser(userElement.getUserId());
                         tdImages.setCreateTime(LocalDateTime.now());
                         tdImagesMapper.insert(tdImages);
 
@@ -260,14 +261,14 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
      * @param userElement
      * @param tpActivity
      */
-    private void insertImg(String [] contentImgArray, UserElement userElement, TpActivity tpActivity) {
+    private void insertImg(String [] contentImgArray, TaUser userElement, TpActivity tpActivity) {
         if (contentImgArray == null) {
             return;
         }
         for (String img : contentImgArray) {
             TdImages tdImages = new TdImages();
             tdImages.setCreateTime(LocalDateTime.now());
-            tdImages.setCreateUser(userElement.getId());
+            tdImages.setCreateUser(userElement.getUserId());
             tdImages.setImageUrl(img);
             tdImages.setType("activity");
             tdImages.setUuid(tpActivity.getId());
@@ -278,7 +279,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateActivity(String parameter, UserElement userElement) {
+    public ResponseBean updateActivity(String parameter, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         TpActivity tpActivity = jsonObject.toJavaObject(TpActivity.class);
@@ -307,7 +308,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
             tdImages.setUuid(tpActivity.getId());
             tdImages.setType("activityCode");
-            tdImages.setCreateUser(userElement.getId());
+            tdImages.setCreateUser(userElement.getUserId());
             tdImages.setCreateTime(LocalDateTime.now());
             tdImagesMapper.insert(tdImages);
         }
@@ -328,13 +329,13 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             selectTpActivity.setCreateDate(LocalDateTime.now());
         } else {
             selectTpActivity.setUpdateDate(LocalDateTime.now());
-            selectTpActivity.setUpdateUser(userElement.getId());
+            selectTpActivity.setUpdateUser(userElement.getUserId());
         }
 
         // 发布时消息为无效
         if ("1".equals(tpActivity.getStatus())) {
             QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("community_id", userElement.getCommunityId());
+            queryWrapper.eq("community_id", userElement.getOrgId());
             queryWrapper.eq("message_type", "8");
             queryWrapper.eq("model_type", "2");
             queryWrapper.eq("source", "2");
@@ -344,7 +345,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             if (null != message) {
                 message.setStatus("0");
                 message.setUpdateDate(LocalDateTime.now());
-                message.setUpdateUser(userElement.getId());
+                message.setUpdateUser(userElement.getUserId());
                 messageMapper.updateById(message);
             }
 
@@ -397,7 +398,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateStatusInvalid(List<Integer> ids, UserElement userElement) {
+    public ResponseBean updateStatusInvalid(List<Integer> ids, TaUser userElement) {
 
         ResponseBean responseBean = new ResponseBean();
         List<TpActivity> tpActivityList = (List<TpActivity>) listByIds(ids);
@@ -406,11 +407,11 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
                 throw new WisdomException("已作废活动无法修改");
             }
             e.setStatus("0");
-            // e.setUpdateUser(userElement.getId());
+            // e.setUpdateUser(userElement.getUserId());
             // 作废时消息为无效
             if ("0".equals(e.getStatus())) {
                 QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("community_id", userElement.getCommunityId());
+                queryWrapper.eq("community_id", userElement.getOrgId());
                 queryWrapper.eq("message_type", "8");
                 queryWrapper.eq("model_type", "2");
                 queryWrapper.eq("source", "2");
@@ -419,7 +420,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
                 if (null != message) {
                     message.setStatus("0");
                     message.setUpdateDate(LocalDateTime.now());
-                    message.setUpdateUser(userElement.getId());
+                    message.setUpdateUser(userElement.getUserId());
                     messageMapper.updateById(message);
                 }
 

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.TpAnnouncementService;

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.TpConfigurationMapper;
 import com.huiju.estateagents.property.dao.TpEquipmentMapper;
@@ -40,21 +41,21 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
     private TpEquipmentTreeMapper tpEquipmentTreeMapper;
 
     @Override
-    public ResponseBean getAllByCommunityAndEquipmentType(UserElement userElement, Integer equipmentType) {
+    public ResponseBean getAllByCommunityAndEquipmentType(TaUser userElement, Integer equipmentType) {
         ResponseBean responseBean = new ResponseBean();
-        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectAllByCommunityAndEquipmentType(userElement.getCommunityId(), equipmentType);
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectAllByCommunityAndEquipmentType(userElement.getOrgId(), equipmentType);
         responseBean.addSuccess(tpEquipments);
         return responseBean;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean saveOrUpdateMonitoring(String parameter, UserElement userElement) {
+    public ResponseBean saveOrUpdateMonitoring(String parameter, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         // 获取这个小区的根节点树
         QueryWrapper<TpEquipmentTree> equipmentTreeQueryWrapper = new QueryWrapper<>();
-        equipmentTreeQueryWrapper.eq("community_id", userElement.getCommunityId());
+        equipmentTreeQueryWrapper.eq("community_id", userElement.getOrgId());
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectOne(equipmentTreeQueryWrapper);
 
         TpEquipment equipment = JSONObject.parseObject(parameter, TpEquipment.class);
@@ -71,13 +72,13 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
 
                 // 开始插入设备数据
                 // 地址
-                TpConfiguration tpConfigurationAddress = insertConfigguration(userElement.getCommunityId(), "监控地址" , address, userElement.getId());
+                TpConfiguration tpConfigurationAddress = insertConfigguration(userElement.getOrgId(), "监控地址" , address, userElement.getUserId());
                 // 监控url
-                TpConfiguration tpConfigurationUrl = insertConfigguration(userElement.getCommunityId(), "监控", url, userElement.getId());
+                TpConfiguration tpConfigurationUrl = insertConfigguration(userElement.getOrgId(), "监控", url, userElement.getUserId());
                 // 保安人员号码
-                TpConfiguration tpConfigurationSecurityGuardTel = insertConfigguration(userElement.getCommunityId(), "保安电话" , securityGuardTel, userElement.getId());
+                TpConfiguration tpConfigurationSecurityGuardTel = insertConfigguration(userElement.getOrgId(), "保安电话" , securityGuardTel, userElement.getUserId());
                 // 保安室号码
-                TpConfiguration tpConfigurationSecurityRoomTel = insertConfigguration(userElement.getCommunityId(), "安保室电话" , securityRoomTel, userElement.getId());
+                TpConfiguration tpConfigurationSecurityRoomTel = insertConfigguration(userElement.getOrgId(), "安保室电话" , securityRoomTel, userElement.getUserId());
 
                 equipment.setAddressId(tpConfigurationAddress.getId());
                 equipment.setUrlId(tpConfigurationUrl.getId());
@@ -86,8 +87,8 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
                 equipment.setEquipmentType("1");
                 equipment.setEquipmentTreeId(tpEquipmentTree.getId());
                 equipment.setCreateTime(LocalDateTime.now());
-                equipment.setCreateUser(userElement.getId());
-                equipment.setCommunityId(userElement.getCommunityId());
+                equipment.setCreateUser(userElement.getUserId());
+                equipment.setCommunityId(userElement.getOrgId());
 
                 tpEquipmentMapper.insert(equipment);
             } else {
@@ -147,9 +148,9 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
     }
 
     @Override
-    public ResponseBean getMonitoringById(UserElement userElement, Integer type, Integer id) {
+    public ResponseBean getMonitoringById(TaUser userElement, Integer type, Integer id) {
         ResponseBean responseBean = new ResponseBean();
-        TpEquipment monitoring = tpEquipmentMapper.getMonitoringById(userElement.getCommunityId(), type, id);
+        TpEquipment monitoring = tpEquipmentMapper.getMonitoringById(userElement.getOrgId(), type, id);
         responseBean.addSuccess(monitoring);
         return responseBean;
     }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.TpRentalHouseImgMapper;
 import com.huiju.estateagents.property.dao.TpRentalHouseMapper;
@@ -52,7 +53,7 @@ public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, T
 	 * @return
 	 */
 	@Override
-	public ResponseBean getRentalList(Integer id, String houseName, Integer startPrice, Integer endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize) {
+	public ResponseBean getRentalList(Integer id, String houseName, Integer startPrice, Integer endPrice, String rentalType, String houseType, String houseStatus, TaUser userElement, Integer pageNum, Integer pageSize) {
 		ResponseBean responseBean = new ResponseBean();
 		Page page = new Page(pageNum,pageSize);
 		TpRentalHouse tpRentalHouse = new TpRentalHouse();
@@ -61,7 +62,7 @@ public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, T
 		tpRentalHouse.setRentalType(rentalType);
 		tpRentalHouse.setHouseType(houseType);
 		tpRentalHouse.setHouseStatus(houseStatus);
-		tpRentalHouse.setCommunityId(userElement.getCommunityId());
+		tpRentalHouse.setCommunityId(userElement.getOrgId());
 		tpRentalHouse.setStartPrice(startPrice);
 		tpRentalHouse.setEndPrice(endPrice);
 		List<TpRentalHouse> list = tpRentalHouseMapper.getRentalList(page,tpRentalHouse);
@@ -80,11 +81,11 @@ public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, T
 	 * @return
 	 */
 	@Override
-	public ResponseBean saveRental(TpRentalHouse rentalHouse, UserElement userElement) {
+	public ResponseBean saveRental(TpRentalHouse rentalHouse, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		//插入房间信息
-		Integer communityId = userElement.getCommunityId();
-		Integer userId = userElement.getId();
+		Integer communityId = userElement.getOrgId();
+		Integer userId = userElement.getUserId();
 		LocalDateTime nowTime = LocalDateTime.now();
 		rentalHouse.setCommunityId(communityId);
 		rentalHouse.setCreateDate(nowTime);
@@ -158,10 +159,10 @@ public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, T
 	 * @return
 	 */
 	@Override
-	public ResponseBean updateRental(TpRentalHouse rentalHouse, UserElement userElement) {
+	public ResponseBean updateRental(TpRentalHouse rentalHouse, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		rentalHouse.setUpdateDate(LocalDateTime.now());
-		rentalHouse.setUpdateUser(userElement.getId());
+		rentalHouse.setUpdateUser(userElement.getUserId());
 		tpRentalHouseMapper.updateById(rentalHouse);
 		//更新首页图片
 		QueryWrapper<TpRentalHouseImg> tpRentalHouseImgQueryWrapper = new QueryWrapper<>();

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.TpShopImgMapper;
 import com.huiju.estateagents.property.dao.TpShopMapper;
@@ -51,7 +52,7 @@ public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> impleme
 	 * @return
 	 */
 	@Override
-	public ResponseBean getShopList(Integer id, String shopName, Integer shopTypeId, String shopStatus, UserElement userElement, Integer pageNum, Integer pageSize) {
+	public ResponseBean getShopList(Integer id, String shopName, Integer shopTypeId, String shopStatus, TaUser userElement, Integer pageNum, Integer pageSize) {
 		ResponseBean responseBean = new ResponseBean();
 		Page page = new Page(pageNum,pageSize);
 		TpShop tpShop = new TpShop();
@@ -59,7 +60,7 @@ public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> impleme
 		tpShop.setShopName(shopName);
 		tpShop.setShopTypeId(shopTypeId);
 		tpShop.setShopStatus(shopStatus);
-		tpShop.setCommunityId(userElement.getCommunityId());
+		tpShop.setCommunityId(userElement.getOrgId());
 		List<TpShop> list = shopMapper.getShopList(page,tpShop);
 		Map<String,Object> map = new HashMap<>();
 		map.put("list", list);
@@ -76,16 +77,16 @@ public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> impleme
 	 * @return
 	 */
 	@Override
-	public ResponseBean saveShop(TpShop shop, UserElement userElement) {
+	public ResponseBean saveShop(TpShop shop, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		//添加商铺信息
-		Integer communityId = userElement.getCommunityId();
+		Integer communityId = userElement.getOrgId();
 		LocalDateTime localDateTime = LocalDateTime.now();
 		shop.setCommunityId(communityId);
-		shop.setCreateUser(userElement.getId());
+		shop.setCreateUser(userElement.getUserId());
 		shop.setCreateDate(localDateTime);
 		shop.setUpdateDate(localDateTime);
-		shop.setUpdateUser(userElement.getId());
+		shop.setUpdateUser(userElement.getUserId());
 		shopMapper.insert(shop);
 		//添加商铺app首页图片信息
 		TpShopImg appIndexShopImg = new TpShopImg();
@@ -165,7 +166,7 @@ public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> impleme
 	 * @return
 	 */
 	@Override
-	public ResponseBean updateShop(TpShop shop, UserElement userElement) {
+	public ResponseBean updateShop(TpShop shop, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		shopMapper.updateById(shop);
 		//添加商铺app首页图片信息

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.TpShopSettingMapper;
 import com.huiju.estateagents.property.dao.TpShopTypeMapper;
@@ -42,31 +43,31 @@ public class TpShopSettingServiceImpl extends ServiceImpl<TpShopSettingMapper, T
 	 * @return
 	 */
 	@Override
-	public ResponseBean changeShopSetting(UserElement userElement, String jsonString) {
+	public ResponseBean changeShopSetting(TaUser userElement, String jsonString) {
 		ResponseBean responseBean = new ResponseBean();
 		JSONObject jsonObject = JSONObject.parseObject(jsonString);
 		boolean shopSettingValue = jsonObject.getBoolean("shopSettingValue");
 		if (shopSettingValue){
 			//开启的情况下，setting表插入一条数据并判断存不存在系统创建的四条数据，不存在添加
 			TpShopSetting tpShopSetting = new TpShopSetting();
-			tpShopSetting.setCommunityId(userElement.getCommunityId());
+			tpShopSetting.setCommunityId(userElement.getOrgId());
 			tpShopSetting.setCreateDate(LocalDateTime.now());
 			
-			tpShopSetting.setCreateUser(userElement.getId());
+			tpShopSetting.setCreateUser(userElement.getUserId());
 			shopSettingMapper.insert(tpShopSetting);
 			//查看是否存在系统创建的四条数据
 			QueryWrapper<TpShopType> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("community_id",userElement.getCommunityId());
+			queryWrapper.eq("community_id",userElement.getOrgId());
 			queryWrapper.eq("source","sys");
 			List<TpShopType> list = shopTypeMapper.selectList(queryWrapper);
 			if (list.size() < 1){
 				//插入数据
-				saveShopTypeDate(userElement.getCommunityId(),userElement.getId());
+				saveShopTypeDate(userElement.getOrgId(),userElement.getUserId());
 			}
 		}else{
 			//删除setting表里面的数据表示关闭
 			QueryWrapper<TpShopSetting> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("community_id",userElement.getCommunityId());
+			queryWrapper.eq("community_id",userElement.getOrgId());
 			shopSettingMapper.delete(queryWrapper);
 		}
 		responseBean.addSuccess("success");

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.model.*;
@@ -155,9 +156,9 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	}
 
 	@Override
-	public ResponseBean transactionsAdd(String paramets, UserElement userElement) {
-		Integer communityId = userElement.getCommunityId();
-		Integer id = userElement.getId();
+	public ResponseBean transactionsAdd(String paramets, TaUser userElement) {
+		Integer communityId = userElement.getOrgId();
+		Integer id = userElement.getUserId();
 		ResponseBean response = new ResponseBean();
 
 		JSONObject jsonobject = JSONObject.parseObject(paramets);
@@ -264,9 +265,9 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	}
 
 	@Override
-	public ResponseBean transactionReplyList(String paramets, UserElement userElement) {
-		Integer communityId = userElement.getCommunityId();
-		Integer userID = userElement.getId();
+	public ResponseBean transactionReplyList(String paramets, TaUser userElement) {
+		Integer communityId = userElement.getOrgId();
+		Integer userID = userElement.getUserId();
 		ResponseBean responseBean = new ResponseBean();
 		JSONObject object= JSONObject.parseObject(paramets);
 		Integer transactionId = object.getInteger("id");
@@ -325,7 +326,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	}
 
 	@Override
-	public ResponseBean transactionReplyAdd(String paramets, UserElement userElement) {
+	public ResponseBean transactionReplyAdd(String paramets, TaUser userElement) {
 		ResponseBean response= new ResponseBean();
 		 JSONObject object= JSONObject.parseObject(paramets);
 		 Integer id= object.getInteger("id");
@@ -347,9 +348,9 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 				TaUserVerify taUserVerify= taUserVerifyMapper.selectById(tpTransaction.getUuid());
 				replyRole = taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription();
 			}
-			transactionReply.setCommunityId(userElement.getCommunityId())
+			transactionReply.setCommunityId(userElement.getOrgId())
 					.setTransactionId(id)
-					.setUuid(userElement.getId())
+					.setUuid(userElement.getUserId())
 					.setUuidType("prop")
 					.setUuidName(userElement.getUserName())
 					.setUuidRole("物业")
@@ -365,9 +366,9 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		if (Type!=1) {
 			// 查询评论信息
 			TransactionReply  Reply= transactionReplyMapper.selectById(id);
-			transactionReply.setCommunityId(userElement.getCommunityId())
+			transactionReply.setCommunityId(userElement.getOrgId())
 					.setTransactionId(Reply.getTransactionId())
-					.setUuid(userElement.getId())
+					.setUuid(userElement.getUserId())
 					.setUuidType("prop")
 					.setUuidName(userElement.getUserName())
 					.setUuidRole("物业")
@@ -388,7 +389,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 			tdImages.setType("reply");
 			tdImages.setUuid(transactionReply.getId());
 			tdImages.setCreateTime(LocalDateTime.now());
-			tdImages.setCreateUser(userElement.getId());
+			tdImages.setCreateUser(userElement.getUserId());
 			tdImagesMapper.insert(tdImages);
 		}
 		response.addSuccess("成功");
@@ -396,7 +397,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	}
 
 	@Override
-	public ResponseBean transactionReportList(String paramets, UserElement userElement) {
+	public ResponseBean transactionReportList(String paramets, TaUser userElement) {
 		ResponseBean response= new ResponseBean();
 			JSONObject object= JSONObject.parseObject(paramets);
 			String reportUserNmae= object.getString("reportUserNmae");

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.BeanTools;
 import com.huiju.estateagents.property.common.UserElement;
@@ -118,11 +119,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     @Override
-    public ResponseBean userInfo(UserElement userElement) {
+    public ResponseBean userInfo(TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         // 查询用户
-        User user = userMapper.selectById(userElement.getId());
+        User user = userMapper.selectById(userElement.getUserId());
         if (null == user) {
             responseBean.addError("该用户不存在!");
             return responseBean;
@@ -130,7 +131,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
         UserVO userVO = new UserVO();
 
-        user.setCommunityId(userElement.getCommunityId());
+        user.setCommunityId(userElement.getOrgId());
         // 查询该用户的权限
         // 获取用户权限
         getUserRole(user,userVO);
@@ -256,13 +257,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         String remark = object.getString("remark");
        //时维护ta_user（发帖需要）
         TaUser  taUser= new TaUser();
-        taUser.setLoginName(loginName)
-                .setCreateUser(userID)
-                .setCreateDate(LocalDateTime.now())
-                .setUserName(userName)
-                .setStatus("1");
-//        taUserMapper.insert(taUser);
-        user.setTaUserId(taUser.getId());
         user.setUserName(userName);
         user.setLoginName(loginName);
         user.setRemark(remark);