Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

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

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.center.taUser.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.service.ITaUserAuthButtonService;
@@ -56,8 +58,11 @@ public class TaUserAuthButtonController extends BaseController {
      */
     @RequestMapping(value="/admin/updateAuthButton",method= RequestMethod.PUT)
     public ResponseBean updateUserAuthMenu(HttpServletRequest request,
-                                           @RequestBody List<SysButtonInMenu> sysButtonList){
+                                           @RequestBody String sysButton){
         Integer userId = getUserId(request);
-        return iTaUserAuthButtonService.updateUserAuthButton(userId, sysButtonList);
+        JSONObject Object = JSONObject.parseObject(sysButton);
+        JSONArray JSONArray = Object.getJSONArray("sysButton");
+        List<SysButtonInMenu> sysButtonInMenuList = JSONArray.toJavaList(SysButtonInMenu.class);
+        return iTaUserAuthButtonService.updateUserAuthButton(userId, sysButtonInMenuList);
     }
 }

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

@@ -1,9 +1,14 @@
 package com.huiju.estateagents.center.taUser.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonArray;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -53,10 +58,17 @@ public class TaUserAuthMenuController extends BaseController {
      * 用户授权菜单
      * @return
      */
-    @RequestMapping(value="/admin/updateAuthMenu",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/updateAuthMenu",method= RequestMethod.POST)
     public ResponseBean updateUserAuthMenu(HttpServletRequest request,
-                                           @RequestBody List<SysMenu> sysMenuList){
-        Integer userId = getUserId(request);
-        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList);
+                                           @RequestBody String sysMenu){
+        JSONObject Object = JSONObject.parseObject(sysMenu);
+        String name = Object.getString("name");
+        Integer userId = Object.getInteger("id");
+        JSONArray JSONArray = Object.getJSONArray("sysMenu");
+        List<SysMenu> sysMenuList = JSONArray.toJavaList(SysMenu.class);
+
+        JSONArray buttonArray = Object.getJSONArray("sysButton");
+        List<SysButtonInMenu> sysButtonInMenuList = buttonArray.toJavaList(SysButtonInMenu.class);
+        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList,name,getOrgId(request),sysButtonInMenuList);
     }
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.center.taUser.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
 
 import java.util.List;
@@ -18,5 +19,5 @@ public interface ITaUserAuthMenuService extends IService<SysMenu> {
 
     ResponseBean getAllMenu(Integer pageNum, Integer pageSize);
 
-    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList);
+    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList,String name,Integer orgid,List<SysButtonInMenu> sysButtonInMenuList);
 }

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

@@ -72,6 +72,7 @@ public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMap
             return responseBean;
         }
 
+
         try{
             //授权菜单按钮，先删除在新增
             taUserAuthButtonMapper.deleteUserAuthButton(userId);

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

@@ -9,12 +9,14 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserAuthMenuMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
-import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaRoleMenu;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TaRoleButtonMapper;
+import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.mapper.TaRoleMenuMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -36,6 +38,12 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private  TaRoleMapper taRoleMapper;
+
+    @Autowired
+    private TaRoleButtonMapper taRoleButtonMapper;
+
     /**
      * 根据用户id获取授权菜单
      * @param pageNum
@@ -72,28 +80,75 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     }
 
     @Override
-    public ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList) {
+    public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
         ResponseBean responseBean = new ResponseBean();
-
-        // 人员
-        TaUser taUser = taUserMapper.selectById(userId);
-        if (null == taUser) {
-            responseBean.addError("授权人不存在");
+        if (null == roleId){
+            addUserAuthMenu( sysMenuList,name,orgId,sysButtonInMenuList);
             return responseBean;
         }
+        try {
+            //授权菜单，先删除在新增
+            taUserAuthMenuMapper.deleteUserAuthMenu(roleId);
+            for (SysMenu sysMenu: sysMenuList) {
+                TaRoleMenu taRoleMenu = new TaRoleMenu();
+                taRoleMenu.setRoleId(roleId);
+                taRoleMenu.setMenuId(sysMenu.getMenuId());
+                taRoleMenuMapper.insert(taRoleMenu);
+            }
+            // 更新Role
+            TaRole taRole = new TaRole();
+            taRole.setRoleId(roleId);
+            taRole.setRoleName(name);
+            taRoleMapper.updateById(taRole);
+
+            // 当前角色的所有按钮再重新插入
+
+            taRoleButtonMapper.deleteCurrentBut(roleId);
+            for (SysButtonInMenu sysButtonInMenu :sysButtonInMenuList) {
+                TaRoleButton taRoleButton = new TaRoleButton();
+                taRoleButton.setRoleId(taRole.getRoleId());
+                taRoleButton.setBtnId(sysButtonInMenu.getBtnId());
+                taRoleButtonMapper.insert(taRoleButton);
+            }
+                responseBean.addSuccess("操作成功");
+            return responseBean;
+        } catch (Exception e) {
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return responseBean;
+        }
+    }
 
+    public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
+        ResponseBean responseBean = new ResponseBean();
         try{
-            //授权菜单，先删除在新增
-            taUserAuthMenuMapper.deleteUserAuthMenu(userId);
-            taUserAuthMenuMapper.addUserAuthMenu(userId, sysMenuList);
+            // 新增角色
+            TaRole taRole = new TaRole();
+            taRole.setRoleName(name);
+            taRole.setOrgId(orgId);
+            taRole.setCreateDate(LocalDateTime.now());
+            taRoleMapper.insert(taRole);
+
+            // 新增角色需要的菜单
+          for (SysMenu sysMenu: sysMenuList){
+              TaRoleMenu taRoleMenu = new TaRoleMenu();
+              taRoleMenu.setRoleId(taRole.getRoleId());
+              taRoleMenu.setMenuId(sysMenu.getMenuId());
+              taRoleMenuMapper.insert(taRoleMenu);
+          }
+          // 新增角色按钮
+          for (SysButtonInMenu sysButtonInMenu :sysButtonInMenuList){
+              TaRoleButton  taRoleButton = new TaRoleButton();
+              taRoleButton.setRoleId(taRole.getRoleId());
+              taRoleButton.setBtnId(sysButtonInMenu.getBtnId());
+              taRoleButtonMapper.insert(taRoleButton);
+          }
             responseBean.addSuccess("操作成功");
-            return  responseBean;
+            return  true;
         }catch (Exception e){
             responseBean.addSuccess("操作失败");
             e.printStackTrace();
-            return responseBean;
+            return false;
         }
-
     }
-
 }

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

@@ -1,20 +1,21 @@
 package com.huiju.estateagents.controller;
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.service.IStatisticalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
-import java.util.Date;
 
 /**
  * 数据统计
  */
 @RestController
 @RequestMapping("/api")
-public class StatisticalController {
+public class StatisticalController extends BaseController {
 
     @Autowired
     private IStatisticalService iStatisticalService;
@@ -24,8 +25,8 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/indexStatistical")
-    public ResponseBean indexStatistical() {
-        return iStatisticalService.indexStatistical();
+    public ResponseBean indexStatistical(HttpServletRequest request) {
+        return iStatisticalService.indexStatistical(getOrgId(request));
     }
 
     /**
@@ -35,8 +36,9 @@ public class StatisticalController {
     @GetMapping(value = "/admin/selectActiveUserCount")
     public ResponseBean selectActiveUserCount(@RequestParam String dateType,
                                               @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
-                                              @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
-        return iStatisticalService.selectActiveUserCount(dateType, startDate,endDate);
+                                              @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                              HttpServletRequest request) {
+        return iStatisticalService.selectActiveUserCount(getOrgId(request), dateType, startDate,endDate);
     }
 
     /**
@@ -45,8 +47,9 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectNewsUserCount")
     public ResponseBean selectNewsUserCount(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
-                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
-        return iStatisticalService.selectNewsUserCount(startDate, endDate);
+                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                            HttpServletRequest request) {
+        return iStatisticalService.selectNewsUserCount(getOrgId(request), startDate, endDate);
     }
 
     /**
@@ -54,8 +57,9 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectConversion")
-    public ResponseBean selectConversion(@RequestParam("conversion") String conversion) {
-        return iStatisticalService.selectConversion(conversion);
+    public ResponseBean selectConversion(@RequestParam("conversion") String conversion,
+                                         HttpServletRequest request) {
+        return iStatisticalService.selectConversion(getOrgId(request), conversion);
     }
 
     /**
@@ -70,8 +74,9 @@ public class StatisticalController {
                                            @RequestParam(value = "buildingId", required = false) String buildingId,
                                            @RequestParam(value = "eventType", required = false) String eventType,
                                            @RequestParam(value = "event", required = false) String event,
-                                           @RequestParam(value = "activity", required = false) String activity) {
-        return iStatisticalService.selectUserBehavior(pageNum, pageSize, startDate, endDate, buildingId, eventType, event, activity);
+                                           @RequestParam(value = "activity", required = false) String activity,
+                                           HttpServletRequest request) {
+        return iStatisticalService.selectUserBehavior(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, eventType, event, activity);
     }
 
     /**
@@ -80,8 +85,9 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectEventAll")
     public ResponseBean selectEventAll(@RequestParam(required = false) String event,
-                                              @RequestParam(required = false) String personId) {
-        return iStatisticalService.selectEventAll(event, personId);
+                                       @RequestParam(required = false) String personId,
+                                       HttpServletRequest request) {
+        return iStatisticalService.selectEventAll(getOrgId(request), event, personId);
     }
 
 
@@ -91,8 +97,9 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectUserResource")
     public ResponseBean selectUserResource(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
-                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
-        return iStatisticalService.selectUserResource(startDate, endDate);
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                           HttpServletRequest request) {
+        return iStatisticalService.selectUserResource(getOrgId(request), startDate, endDate);
     }
 
 
@@ -101,8 +108,8 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectUserCount")
-    public ResponseBean selectUserResource() {
-        return iStatisticalService.selectUserCount();
+    public ResponseBean selectUserResource(HttpServletRequest request) {
+        return iStatisticalService.selectUserCount(getOrgId(request));
     }
 
     /**
@@ -110,8 +117,8 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectRegisteredCount")
-    public ResponseBean selectRegisteredCount() {
-        return iStatisticalService.selectRegisteredCount();
+    public ResponseBean selectRegisteredCount(HttpServletRequest request) {
+        return iStatisticalService.selectRegisteredCount(getOrgId(request));
     }
 
     /**
@@ -120,8 +127,9 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectRecentlyCount")
     public ResponseBean selectRecentlyCount(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
-                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate) {
-        return iStatisticalService.selectRecentlyCount(startDate, endDate);
+                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                            HttpServletRequest request) {
+        return iStatisticalService.selectRecentlyCount(getOrgId(request), startDate, endDate);
     }
 
     /**
@@ -129,8 +137,8 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectSexUser")
-    public ResponseBean selectSexUser() {
-        return iStatisticalService.selectSexUser();
+    public ResponseBean selectSexUser(HttpServletRequest request) {
+        return iStatisticalService.selectSexUser(getOrgId(request));
     }
 
     /**
@@ -138,8 +146,9 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectCityUser")
-    public ResponseBean selectCityUser() {
-        return iStatisticalService.selectCityUser();
+    public ResponseBean selectCityUser(HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        return iStatisticalService.selectCityUser(orgId);
     }
 
     /**
@@ -149,8 +158,9 @@ public class StatisticalController {
     @GetMapping(value = "/admin/selectIntentionUser")
     public ResponseBean selectIntentionUser(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                             @RequestParam(value = "pageSize", defaultValue = "2") Integer pageSize,
-                                            @RequestParam(value = "buildingId", required = false) String buildingId) {
-        return iStatisticalService.selectIntentionUser(pageNum, pageSize, buildingId);
+                                            @RequestParam(value = "buildingId", required = false) String buildingId,
+                                            HttpServletRequest request) {
+        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId);
     }
 
 }

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

@@ -75,8 +75,8 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
                                      @RequestParam(value = "isMain",required = false)Integer isMain,
-                                     @RequestParam(value = "orgId",required = false)Integer orgId){
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
+                                     HttpServletRequest request){
+        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request));
     }
 
     /**
@@ -96,9 +96,9 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
-                                     @RequestParam(value = "isMain",required = false)Integer isMain,HttpServletRequest request){
-        Map map = JWTUtils.getUserIdAndOrgId(request);
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,Integer.valueOf(map.get("orgId").toString()));
+                                     @RequestParam(value = "isMain",required = false)Integer isMain,
+                                           HttpServletRequest request){
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request));
     }
 
     /**
@@ -107,8 +107,8 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @PutMapping("/admin/building/update")
-    public ResponseBean buildingUpdate(@RequestBody String parameter){
-        return taBuildingService.buildingUpdate(parameter);
+    public ResponseBean buildingUpdate(@RequestBody String parameter, HttpServletRequest request){
+        return taBuildingService.buildingUpdate(parameter, getOrgId(request));
     }
 
     /**
@@ -117,8 +117,8 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
-    public ResponseBean buildingAdd(@RequestBody String parameter){
-        return taBuildingService.buildingAdd(parameter);
+    public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request){
+        return taBuildingService.buildingAdd(parameter, getOrgId(request));
     }
 
     /**
@@ -127,19 +127,19 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/building/update/status", method = RequestMethod.PUT)
-    public ResponseBean buildingUpdateStatus(@RequestBody String parameter){
-        return taBuildingService.buildingUpdateStatus(parameter);
+    public ResponseBean buildingUpdateStatus(@RequestBody String parameter, HttpServletRequest request){
+        return taBuildingService.buildingUpdateStatus(parameter, getOrgId(request));
     }
 
     /**
      * 楼盘删除
      * @param id
-     * @param session
+     * @param request
      * @return
      */
     @RequestMapping(value = "/admin/building/delete/{id}", method = RequestMethod.DELETE)
-    public ResponseBean buildingdelete(@PathVariable("id") String id, HttpSession session){
-        return taBuildingService.buildingdelete(id);
+    public ResponseBean buildingdelete(@PathVariable("id") String id, HttpServletRequest request){
+        return taBuildingService.buildingdelete(id, getOrgId(request));
     }
 
     /**
@@ -284,8 +284,8 @@ public class TaBuildingController extends BaseController {
      * 查询当前所有项目
      */
     @RequestMapping(value = "/admin/buildingAll", method = RequestMethod.GET)
-    public  ResponseBean buildingAll(){
-        ResponseBean taBuilding= taBuildingService.buildingAll();
+    public  ResponseBean buildingAll(HttpServletRequest request){
+        ResponseBean taBuilding= taBuildingService.buildingAll(getOrgId(request));
         return taBuilding;
     }
 }

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

@@ -251,24 +251,26 @@ public class TaBuildingDynamicController extends BaseController {
 
 
     @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
-    public ResponseBean send(@PathVariable String dynamicId) {
+    public ResponseBean send(@PathVariable String dynamicId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
         dynamic.setStatus(1);
         dynamic.setPublishDate(LocalDateTime.now());
+        dynamic.setOrgId(getOrgId(request));
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }
 
     @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
-    public ResponseBean cancel(@PathVariable String dynamicId) {
+    public ResponseBean cancel(@PathVariable String dynamicId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
         dynamic.setStatus(0);
+        dynamic.setOrgId(getOrgId(request));
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }
@@ -292,11 +294,12 @@ public class TaBuildingDynamicController extends BaseController {
     @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
     public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                     @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
-                                    @RequestParam(value = "dynamicId",required = false)String dynamicId) {
+                                    @RequestParam(value = "dynamicId",required = false)String dynamicId,
+                                    HttpServletRequest request) {
         Page<TaActivityDynamicEnlist> page = new Page<>();
         page.setSize(pageSize);
         page.setCurrent(pageNum);
-        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId);
+        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId, getOrgId(request));
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("list", signList);

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -92,9 +93,9 @@ public class TaBuildingIntentionController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taBuildingIntentionAddOrUpdate/{buildingId}",method= RequestMethod.POST)
-    public ResponseBean taBuildingIntentionAddOrUpdate(@RequestBody List<TdBizEvent> tdBizEventList, @PathVariable String buildingId){
+    public ResponseBean taBuildingIntentionAddOrUpdate(@RequestBody List<TdBizEvent> tdBizEventList, @PathVariable String buildingId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iTaBuildingIntentionService.taBuildingIntentionAddOrUpdate(tdBizEventList, buildingId);
+        responseBean = iTaBuildingIntentionService.taBuildingIntentionAddOrUpdate(tdBizEventList, buildingId, getOrgId(request));
         return responseBean;
     }
 

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -51,13 +52,15 @@ public class TaBuildingReportController extends BaseController {
      */
     @RequestMapping(value="/admin/taBuildingReports",method= RequestMethod.GET)
     public ResponseBean taBuildingReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaBuildingReport> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaBuildingReport> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
+            queryWrapper.eq("org_id", getOrgId(request));
 
             IPage<TaBuildingReport> result = iTaBuildingReportService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -74,13 +77,15 @@ public class TaBuildingReportController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taBuildingReport/add",method= RequestMethod.POST)
-    public ResponseBean taBuildingReportAdd(@RequestBody String jsonString){
+    public ResponseBean taBuildingReportAdd(@RequestBody String jsonString, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
         try {
             JSONArray jsonArray = JSONObject.parseObject(jsonString).getJSONArray("list");
             List<TaBuildingReport> list = new ArrayList<>();
             jsonArray.stream().forEach(e -> {
                 TaBuildingReport taBuildingReport = new TaBuildingReport();
+                taBuildingReport.setOrgId(orgId);
                 taBuildingReport.setReportCode(e.toString());
                 taBuildingReport.setCreateDate(LocalDateTime.now());
                 list.add(taBuildingReport);
@@ -128,9 +133,11 @@ public class TaBuildingReportController extends BaseController {
      */
     @RequestMapping(value="/taBuildingReport/{id}",method= RequestMethod.PUT)
     public ResponseBean taBuildingReportUpdate(@PathVariable Integer id,
-                                        @RequestBody TaBuildingReport taBuildingReport){
+                                        @RequestBody TaBuildingReport taBuildingReport,
+                                               HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taBuildingReport.setOrgId(getOrgId(request));
             if (iTaBuildingReportService.updateById(taBuildingReport)){
                 responseBean.addSuccess(taBuildingReport);
             }else {

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

@@ -54,14 +54,15 @@ public class TaCustomerMessageController extends BaseController {
      */
     @RequestMapping(value="/admin/taCustomerMessage",method= RequestMethod.GET)
     public ResponseBean taCustomerMessageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaCustomerMessage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCustomerMessage> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
-
+            queryWrapper.eq("org_id", getOrgId(request));
             IPage<TaCustomerMessage> result = iTaCustomerMessageService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
@@ -78,9 +79,10 @@ public class TaCustomerMessageController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCustomerMessage",method= RequestMethod.POST)
-    public ResponseBean taCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage){
+    public ResponseBean taCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taCustomerMessage.setOrgId(getOrgId(request));
             if (iTaCustomerMessageService.save(taCustomerMessage)){
                 responseBean.addSuccess(taCustomerMessage);
             }else {
@@ -124,9 +126,11 @@ public class TaCustomerMessageController extends BaseController {
      */
     @RequestMapping(value="/taCustomerMessage/{id}",method= RequestMethod.PUT)
     public ResponseBean taCustomerMessageUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCustomerMessage taCustomerMessage){
+                                                @RequestBody TaCustomerMessage taCustomerMessage,
+                                                HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taCustomerMessage.setOrgId(getOrgId(request));
             if (iTaCustomerMessageService.updateById(taCustomerMessage)){
                 responseBean.addSuccess(taCustomerMessage);
             }else {

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

@@ -63,13 +63,13 @@ public class TaNewsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
-    public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean taNewsList(HttpServletRequest request,
+                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
-                                   @RequestParam(value = "orgId", required = false) Integer orgId,
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus);
         return responseBean;
     }
 
@@ -109,9 +109,10 @@ public class TaNewsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
-    public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
+    public ResponseBean taNewsAdd(@RequestBody TaNews taNews, HttpServletRequest request){
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
         taNews.setCityId(cityId);
+        taNews.setOrgId(getOrgId(request));
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
         return responseBean;
     }
@@ -135,10 +136,12 @@ public class TaNewsController extends BaseController {
      */
     @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.PUT)
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
-                                        @RequestBody TaNews taNews){
+                                        @RequestBody TaNews taNews,
+                                     HttpServletRequest request){
         taNews.setNewsId(id);
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
         taNews.setCityId(cityId);
+        taNews.setOrgId(getOrgId(request));
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
         return responseBean;
     }

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

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 资讯类型表  前端控制器
@@ -46,8 +48,8 @@ public class TaNewsTypeController extends BaseController {
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
-                                       @RequestParam(value = "orgId", required = false) Integer orgId){
-        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, orgId);
+                                       HttpServletRequest request){
+        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request));
         return responseBean;
     }
 
@@ -57,8 +59,8 @@ public class TaNewsTypeController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taNewsType",method= RequestMethod.POST)
-    public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType){
-        ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType);
+    public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType, HttpServletRequest request){
+        ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType, getOrgId(request));
         return responseBean;
     }
 
@@ -81,8 +83,9 @@ public class TaNewsTypeController extends BaseController {
      */
     @RequestMapping(value="/admin/taNewsType/{id}",method= RequestMethod.PUT)
     public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
-                                        @RequestBody TaNewsType taNewsType){
+                                        @RequestBody TaNewsType taNewsType, HttpServletRequest request){
         taNewsType.setNewsTypeId(id);
+        taNewsType.setOrgId(getOrgId(request));
         ResponseBean responseBean = iTaNewsTypeService.updateTaNewsType(taNewsType);
         return responseBean;
     }

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

@@ -416,13 +416,27 @@ public class TaPersonController extends BaseController {
         return taPersonService.editConsultant(id, paramStr);
     }
 
-    @PutMapping("/wx/editConsultant/{id}")
-    public ResponseBean editWxConsultant(@PathVariable String id, @RequestBody TaPerson taPerson) {
+    @PutMapping("/wx/editPerson")
+    public ResponseBean editWxConsultant(@RequestParam(required = false)String name,@RequestParam(required = false)String avatar,@RequestParam(required = false)String phone,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        if (!StringUtils.isEmpty(name)){
+            person.setName(name);
+        }
+        if (!StringUtils.isEmpty(avatar)){
+            person.setAvatarurl(avatar);
+        }
+        if (!StringUtils.isEmpty(phone)){
+            person.setTel(phone);
+        }
         try{
-            taPerson.setPersonId(id);
-            if(taPersonService.updateById(taPerson)){
-                responseBean.addSuccess(taPerson);
+            if(taPersonService.updateById(person)){
+                responseBean.addSuccess(person);
             }else {
                 responseBean.addError("fail");
             }
@@ -563,6 +577,7 @@ public class TaPersonController extends BaseController {
 
         return ResponseBean.success(taPerson);
     }
+
     
     /**
      * 微信添加人员添加城市
@@ -594,4 +609,5 @@ public class TaPersonController extends BaseController {
         responseBean.addError("未找到城市");
         return responseBean;
     }
+
 }

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

@@ -55,7 +55,8 @@ public class TaPolicyController extends BaseController {
     @RequestMapping(value="/admin/taPolicy",method= RequestMethod.GET)
     public ResponseBean taPolicyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                     @RequestParam(value ="cityId") Integer cityId){
+                                     @RequestParam(value ="cityId", required = false) Integer cityId,
+                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -64,6 +65,7 @@ public class TaPolicyController extends BaseController {
             queryWrapper.eq(null != cityId,"city_id",cityId);
             queryWrapper.orderByDesc("weight", "create_date");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("org_id", getOrgId(request));
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -124,6 +126,7 @@ public class TaPolicyController extends BaseController {
 
             taPolicy.setStatus(1);
             taPolicy.setCreateDate(LocalDateTime.now());
+            taPolicy.setOrgId(getOrgId(request));
 
             if (iTaPolicyService.save(taPolicy)){
                 responseBean.addSuccess(taPolicy);
@@ -182,6 +185,7 @@ public class TaPolicyController extends BaseController {
 
             TdCity tdCity = iTdCityService.getById(taPolicy.getCityId());
             taPolicy.setCityName(tdCity.getName());
+            taPolicy.setOrgId(getOrgId(request));
 
             if (iTaPolicyService.updateById(taPolicy)){
                 responseBean.addSuccess(taPolicy);

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

@@ -215,7 +215,8 @@ public class TaRecommendCustomerController extends BaseController {
 
     // 客户列表 公客/私客
     @GetMapping("/admin/customer/recommend")
-    public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
+    public ResponseBean getCustomerList (HttpServletRequest request,
+                                         @RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
                                          @RequestParam(value ="consultName",required = false) String consultName,
@@ -227,7 +228,7 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value = "sex",required = false)Integer sex,
                                          @RequestParam(value = "customerType") String customerType){ // public 公  private 私
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, null)); //getOrgId(request)
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -336,11 +337,11 @@ public class TaRecommendCustomerController extends BaseController {
      * @param taRecommendCustomer 实体对象
      * @return
      */
-    @RequestMapping(value="/wx/customer/recommend/edit/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String id,
+    @RequestMapping(value="/wx/customer/recommend/edit/{customerId}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String customerId,
                                         @RequestBody TaRecommendCustomer taRecommendCustomer){
         ResponseBean responseBean = new ResponseBean();
-        taRecommendCustomer.setCustomerId(id);
+        taRecommendCustomer.setCustomerId(customerId);
         try {
             if (taRecommendCustomerService.updateById(taRecommendCustomer)){
                 responseBean.addSuccess(taRecommendCustomer);
@@ -399,8 +400,8 @@ public class TaRecommendCustomerController extends BaseController {
 //        return responseBean;
 //    }
 
-    @RequestMapping(value = "/wx/customer/recommend/get/{id}", method = RequestMethod.GET)
-    public ResponseBean getSingleCustomer(@PathVariable(value = "id") String customerId) {
+    @RequestMapping(value = "/wx/customer/recommend/get/{customerId}", method = RequestMethod.GET)
+    public ResponseBean getSingleCustomer(@PathVariable(value = "customerId") String customerId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getById(customerId));

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

@@ -66,7 +66,7 @@ public class TaRoleController extends BaseController {
      * @param taRole 实体对象
      * @return
      */
-    @RequestMapping(value="/taRole",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taRole",method= RequestMethod.POST)
     public ResponseBean taRoleAdd(@RequestBody TaRole taRole){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -111,24 +111,18 @@ public class TaRoleController extends BaseController {
      * @param taRole 实体对象
      * @return
      */
-    @RequestMapping(value="/taRole/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/editAndAddRole/{id}",method= RequestMethod.POST)
     public ResponseBean taRoleUpdate(@PathVariable Integer id,
-                                        @RequestBody TaRole taRole){
+                                        @RequestBody TaRole taRole) {
         ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iTaRoleService.updateById(taRole)){
-                responseBean.addSuccess(taRole);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taRoleUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
+        if (null==id){
+            iTaRoleService.save(taRole);
+        }else{
+            iTaRoleService.updateById(taRole);
         }
+        responseBean.addSuccess("成果");
         return responseBean;
     }
-
     /**
      * 根据id查询对象
      * @param id  实体ID
@@ -164,10 +158,11 @@ public class TaRoleController extends BaseController {
     /**
      * 查询当前角色信息
      */
-    @RequestMapping(value="/admin/taRole/details/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taRole/details/{id}",method= RequestMethod.GET)
     public ResponseBean taRoleDetails(@PathVariable Integer id,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-       TaRole taRole = iTaRoleService.taRoleDetails(id,getOrgId(request));
+        TaRole taRole = iTaRoleService.taRoleDetails(id,getOrgId(request));
+        responseBean.addSuccess(taRole);
         return responseBean;
     }
 }

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

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 事件字典  前端控制器
@@ -44,7 +46,8 @@ public class TdBizEventController extends BaseController {
      */
     @RequestMapping(value="/admin/tdBizEvent",method= RequestMethod.GET)
     public ResponseBean tdBizEventList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -70,13 +73,14 @@ public class TdBizEventController extends BaseController {
      */
     @RequestMapping(value="/admin/tdBizEventIntention",method= RequestMethod.GET)
     public ResponseBean tdBizEventAndIntention(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                            @RequestParam(value = "buildingId", required = false) String buildingId){
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value = "buildingId", required = false) String buildingId,
+                                               HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TdBizEvent> pg = new Page<>(pageNum, pageSize);
-            responseBean = iTdBizEventService.getBizEventAndIntention(pg, buildingId);
+            responseBean = iTdBizEventService.getBizEventAndIntention(pg, buildingId, getOrgId(request));
         }catch (Exception e){
             logger.error("tdBizEventList -=- {}",e.toString());
             responseBean.addError(e.getMessage());

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

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 项目类型字典表  前端控制器
@@ -44,7 +46,8 @@ public class TdBuildingTypeController extends BaseController {
      */
     @RequestMapping(value="/admin/tdBuildingType",method= RequestMethod.GET)
     public ResponseBean tdBuildingTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -52,6 +55,7 @@ public class TdBuildingTypeController extends BaseController {
             QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("status", 1);
             queryWrapper.orderByDesc("create_date");
+            queryWrapper.eq("org_id", getOrgId(request));
 
             IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -95,9 +99,10 @@ public class TdBuildingTypeController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/tdBuildingType",method= RequestMethod.POST)
-    public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType){
+    public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            tdBuildingType.setOrgId(getOrgId(request));
             if (iTdBuildingTypeService.save(tdBuildingType)){
                 responseBean.addSuccess(tdBuildingType);
             }else {
@@ -139,9 +144,11 @@ public class TdBuildingTypeController extends BaseController {
      */
     @RequestMapping(value="/admin/tdBuildingType/{id}",method= RequestMethod.PUT)
     public ResponseBean tdBuildingTypeUpdate(@PathVariable Integer id,
-                                        @RequestBody TdBuildingType tdBuildingType){
+                                        @RequestBody TdBuildingType tdBuildingType,
+                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            tdBuildingType.setOrgId(getOrgId(request));
             if (iTdBuildingTypeService.updateById(tdBuildingType)){
                 responseBean.addSuccess(tdBuildingType);
             }else {

src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java

@@ -50,6 +50,8 @@ public class SysButtonInMenu implements Serializable {
     
     private String remark;
 
+    private String remark;
+
     @TableField(exist = false)
     private List<Integer> roles;
 }

src/main/java/com/huiju/estateagents/entity/SysMenu.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -82,4 +83,10 @@ public class SysMenu implements Serializable {
      */
     @TableField(exist = false)
     private List<Integer> roles;
+
+    /**
+     * 菜单下的按钮
+     */
+    @TableField(exist = false)
+    private List<SysButtonInMenu> sysButtonInMenu;
 }

src/main/java/com/huiju/estateagents/entity/TaRole.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -8,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -55,5 +58,17 @@ public class TaRole implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 当前角色菜单
+     */
+    @TableField(exist = false)
+    private List<SysMenu> sysMenuList;
+
+    /**
+     * 当前按钮
+     */
+    @TableField(exist = false)
+    private List<SysButtonInMenu> sysButtonInMenu;
+
 
 }

src/main/java/com/huiju/estateagents/mapper/TaActivityDynamicEnlistMapper.java

@@ -25,5 +25,5 @@ public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDyna
      * @param dynamicId
      * @return
      */
-    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId);
+    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java

@@ -63,11 +63,11 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * 转化率 活动收藏 / 活动分享
      * @return
      */
-    Map<String, Object> selectBuildingDynamicStatistical(@Param("saveOrShare") String saveOrShare);
+    Map<String, Object> selectBuildingDynamicStatistical(@Param("orgId") Integer orgId, @Param("saveOrShare") String saveOrShare);
 
     /**
      * 转化率 活动报名
      * @return
      */
-    Map<String, Object> selectBuildingDynamicEnlistStatistical();
+    Map<String, Object> selectBuildingDynamicEnlistStatistical(@Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -41,7 +41,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")
     void setFieldNum(@Param("buildingId") String buildingId, @Param("field") String field, @Param("increment") int increment);
 
-    List<TaBuilding> buildingAll();
+    List<TaBuilding> buildingAll(@Param("orgId") Integer orgId);
 
     /**
      * 查询当前楼盘
@@ -54,7 +54,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * 转化率 项目收藏 / 项目分享
      * @return
      */
-    Map<String, Object> selectBuildingStatistical(@Param("saveOrShare") String saveOrShare);
+    Map<String, Object> selectBuildingStatistical(@Param("orgId")Integer orgId, @Param("saveOrShare") String saveOrShare);
 
     /**
      * 查询楼盘

src/main/java/com/huiju/estateagents/mapper/TaBuildingProjectTypeMapper.java

@@ -32,5 +32,5 @@ public interface TaBuildingProjectTypeMapper extends BaseMapper<TaBuildingProjec
      * 批量添加
      * @param list
      */
-    void insertBuildingProjectTypeBatch(@Param("list") List list);
+    void insertBuildingProjectTypeBatch(@Param("list") List list, @Param("buildingId") String buildingId);
 }

src/main/java/com/huiju/estateagents/mapper/TaNewsMapper.java

@@ -33,6 +33,6 @@ public interface TaNewsMapper extends BaseMapper<TaNews> {
      * 转化率 咨迅收藏 / 咨迅分享
      * @return
      */
-    Map<String, Object> selectNewsStatistical(@Param("saveOrShare") String saveOrShare);
+    Map<String, Object> selectNewsStatistical(@Param("orgId") Integer orgId, @Param("saveOrShare") String saveOrShare);
 
 }

src/main/java/com/huiju/estateagents/mapper/TaPersonIntentionRecordMapper.java

@@ -29,5 +29,5 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
      * @param buildingId
      * @return
      */
-    IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page, @Param("buildingId") String buildingId);
+    IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page, @Param("orgId") Integer orgId, @Param("buildingId") String buildingId);
 }

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -56,8 +56,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(1) from ta_person where ifnull(person_type, '') != #{personType}")
-    Integer selectUserCount(@Param("personType") String personType);
+    @Select("select count(1) from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType}")
+    Integer selectUserCount(@Param("org") Integer orgId, @Param("personType") String personType);
 
     /**
      * 总注册数
@@ -65,15 +65,15 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(1) from ta_person where ifnull(person_type, '') != #{personType} and phone is not null")
-    Integer selectRegisteredCount(@Param("personType") String personType);
+    @Select("select count(1) from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType} and phone is not null")
+    Integer selectRegisteredCount(@Param("org") Integer orgId, @Param("personType") String personType);
 
     /**
      * 根据时间段查询
      * @param personType
      * @return
      */
-    Integer selectRecentlyCount(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    Integer selectRecentlyCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     //---------- 用户总数 end ------------
 
@@ -84,7 +84,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param endDate
      * @return
      */
-    List<PersonPO> selectUserBehavior(@Param("personType") String personType,
+    List<PersonPO> selectUserBehavior(@Param("org") Integer orgId,
+                                      @Param("personType") String personType,
                                       @Param("startDate")LocalDate startDate,
                                       @Param("endDate")LocalDate endDate,
                                       @Param("buildingId") String buildingId,
@@ -98,7 +99,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param dateType
      * @return
      */
-    List<Map<String, Object>> selectActiveUserCount(@Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectActiveUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     /**
      * 新增用户数
@@ -107,7 +108,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param endDate
      * @return
      */
-    List<Map<String, Object>> selectNewsUserCount(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectNewsUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     /**
      * 性别比例
@@ -117,8 +118,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param personType
      * @return
      */
-    @Select("select count(1) as sex_count from ta_person where ifnull(person_type, '') != #{personType} and gender = #{gender}")
-    Integer selectSexUser(@Param("personType") String personType, @Param("gender") Integer gender);
+    @Select("select count(1) as sex_count from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType} and gender = #{gender}")
+    Integer selectSexUser(@Param("org") Integer orgId, @Param("personType") String personType, @Param("gender") Integer gender);
 
 
     /**
@@ -128,12 +129,21 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      */
     @ResultType(Map.class)
     @Select("SELECT " +
-            "ifnull(b.NAME, '其他') AS city, " +
-            "count(a.person_id) AS city_count " +
-            " FROM" +
-            " ta_person a" +
-            " LEFT JOIN ( select t.*, s.pinyin as province from td_city t JOIN td_city s on t.parentid = s.id) b ON a.city = b.pinyin and a.province = b.province where ifnull(a.person_type, '') != #{personType} and a.city is not null GROUP BY a.city")
-    List<Map<String, Object>> selectCityUser(@Param("personType") String personType);
+            " 	a.city as city, " +
+            "	b.shortname AS name, " +
+            "	b.lng, " +
+            "	b.lat, " +
+            "	count(a.person_id) AS cityCount " +
+            "FROM " +
+            "	ta_person a " +
+            "inner JOIN td_city b " +
+            "on a.city = b.id " +
+            "WHERE " +
+            "   a.org_id = #{org} " +
+            "	AND ifnull(a.person_type, '') != #{personType} " +
+            "GROUP BY " +
+            "	a.city ")
+    List<Map<String, Object>> selectCityUser(@Param("org") Integer orgId, @Param("personType") String personType);
 
 
     // ------------- 用户来源 start ------------
@@ -143,18 +153,18 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param recommendPersonType
      * @return
      */
-    Integer selectUserSourcePie(@Param("recommendPersonType") String recommendPersonType, @Param("personType") String personType);
+    Integer selectUserSourcePie(@Param("org") Integer orgId, @Param("recommendPersonType") String recommendPersonType, @Param("personType") String personType);
 
     /**
      * 用户来源 柱状
      * @return
      */
-    List<Map<String, Object>> selectUserSourceColumnar(@Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectUserSourceColumnar(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     /**
      * 用户来源 数据列表
      */
-    List<Map<String,Object>> selectUserSourceData(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String,Object>> selectUserSourceData(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     // ------------- 用户来源 end ------------
 

src/main/java/com/huiju/estateagents/mapper/TaRoleButtonMapper.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaRoleButton;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaRoleButtonMapper extends BaseMapper<TaRoleButton> {
 
+    void deleteCurrentBut(@Param("roleId") Integer roleId);
 }

src/main/java/com/huiju/estateagents/mapper/TdBizEventMapper.java

@@ -26,5 +26,5 @@ public interface TdBizEventMapper extends BaseMapper<TdBizEvent> {
      * @param buildingId
      * @return
      */
-    IPage<TdBizEvent> selectBizEventAndIntention(IPage<TdBizEvent> pg, @Param("buildingId") String buildingId);
+    IPage<TdBizEvent> selectBizEventAndIntention(IPage<TdBizEvent> pg, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/IStatisticalService.java

@@ -14,26 +14,26 @@ public interface IStatisticalService {
      * 首页统计总数
      * @return
      */
-    ResponseBean indexStatistical();
+    ResponseBean indexStatistical(Integer orgId);
 
     // ----------------   用户统计 start --------------
     /**
      * 用户总数
      * @return
      */
-    ResponseBean selectUserCount();
+    ResponseBean selectUserCount(Integer orgId);
 
     /**
      * 注册数
      * @return
      */
-    ResponseBean selectRegisteredCount();
+    ResponseBean selectRegisteredCount(Integer orgId);
 
     /**
      * 用户最近七天
      * @return
      */
-    ResponseBean selectRecentlyCount(LocalDate startDate, LocalDate endDate);
+    ResponseBean selectRecentlyCount(Integer orgId, LocalDate startDate, LocalDate endDate);
 
     // ----------------   用户统计 end --------------
 
@@ -41,19 +41,19 @@ public interface IStatisticalService {
      * 性别比例
      * @return
      */
-    ResponseBean selectSexUser();
+    ResponseBean selectSexUser(Integer orgId);
 
     /**
      * 城市比例
      * @return
      */
-    ResponseBean selectCityUser();
+    ResponseBean selectCityUser(Integer orgId);
 
     /**
      * 活跃用户数
      * @return
      */
-    ResponseBean selectActiveUserCount(String dateType, LocalDate startDate, LocalDate endDate);
+    ResponseBean selectActiveUserCount(Integer orgId, String dateType, LocalDate startDate, LocalDate endDate);
 
     /**
      * 新增用户数
@@ -61,7 +61,7 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean selectNewsUserCount(LocalDate startDate,LocalDate endDate);
+    ResponseBean selectNewsUserCount(Integer orgId, LocalDate startDate,LocalDate endDate);
 
     /**
      * 用户行为
@@ -71,6 +71,7 @@ public interface IStatisticalService {
      */
     ResponseBean selectUserBehavior(Integer pageNum,
                                     Integer pageSize,
+                                    Integer orgId,
                                     LocalDate startDate,
                                     LocalDate endDate,
                                     String buildingId,
@@ -84,25 +85,25 @@ public interface IStatisticalService {
      * @param personId
      * @return
      */
-    ResponseBean selectEventAll(String event, String personId);
+    ResponseBean selectEventAll(Integer orgId, String event, String personId);
 
     /**
      * 转换率 统计
      * @param conversion
      * @return
      */
-    ResponseBean selectConversion(String conversion);
+    ResponseBean selectConversion(Integer orgId, String conversion);
 
     /**
      * 用户来源 首页
      * @return
      */
-    ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate);
+    ResponseBean selectUserResource(Integer orgId, LocalDate startDate, LocalDate endDate);
 
     /**
      * 意向用户 首页
      * @param buildingId
      * @return
      */
-    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, String buildingId);
+    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId);
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

@@ -79,7 +79,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @param page
      * @return
      */
-    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId);
+    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId);
 
     IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
 

src/main/java/com/huiju/estateagents/service/ITaBuildingIntentionService.java

@@ -23,5 +23,5 @@ public interface ITaBuildingIntentionService extends IService<TaBuildingIntentio
      * @param tdBizEventsList
      * @return
      */
-    ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent> tdBizEventsList, String buildingId);
+    ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent> tdBizEventsList, String buildingId, Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -54,7 +54,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param parameter
      * @return
      */
-    ResponseBean buildingUpdate(String parameter);
+    ResponseBean buildingUpdate(String parameter, Integer orgId);
 
     /**
      *
@@ -68,19 +68,19 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param parameter
      * @return
      */
-    ResponseBean buildingAdd(String parameter);
+    ResponseBean buildingAdd(String parameter, Integer orgId);
 
     /**
      * 修改成已发布
      * @return
      */
-    ResponseBean buildingUpdateStatus(String parameter);
+    ResponseBean buildingUpdateStatus(String parameter, Integer orgId);
 
     /**
      * 楼盘删除
      * @return
      */
-    ResponseBean buildingdelete(String id);
+    ResponseBean buildingdelete(String id, Integer orgId);
 
 
     /**
@@ -155,7 +155,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * 查询所有项目
      * @return
      */
-    ResponseBean buildingAll();
+    ResponseBean buildingAll(Integer orgId);
 
     Integer getCityById(String buildingId);
 }

src/main/java/com/huiju/estateagents/service/ITaNewsTypeService.java

@@ -43,7 +43,7 @@ public interface ITaNewsTypeService extends IService<TaNewsType> {
      * @param taNewsType
      * @return
      */
-    ResponseBean addTaNewsType(TaNewsType taNewsType);
+    ResponseBean addTaNewsType(TaNewsType taNewsType, Integer orgId);
 
     /**
      * 删除资讯类型

src/main/java/com/huiju/estateagents/service/ITdBizEventService.java

@@ -22,6 +22,6 @@ public interface ITdBizEventService extends IService<TdBizEvent> {
      * @param buildingId
      * @return
      */
-    ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId);
+    ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId, Integer orgId);
 
 }

src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java

@@ -46,33 +46,33 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
 
     @Override
-    public ResponseBean indexStatistical() {
+    public ResponseBean indexStatistical(Integer orgId) {
 
         ResponseBean responseBean = new ResponseBean();
         Map<String,Object> map = new HashMap<>();
 
         // 总用户数
-        Integer selectUserCount = taPersonMapper.selectUserCount(CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
 
         // 注册数
-        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
 
         // 最近七天
-        Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
+        Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
 
         // 用户行为
-        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, null, null, null, null, null, null);
+        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null, null, null, null, null);
 
         // 用户活跃数
-        List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.DAY, null, null);
+        List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.DAY, null, null);
 
         // 新增用户数
-        List<Map<String, Object>> selectNewsUserCount = taPersonMapper.selectNewsUserCount(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
+        List<Map<String, Object>> selectNewsUserCount = taPersonMapper.selectNewsUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
 
         // 性别比例
         // 1 男 2 女
-        Integer selectSexMale = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
-        Integer selectSexFemale = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
         Map<String, Object> selectSexMaleMap = new HashMap<>();
         selectSexMaleMap.put("name", "男");
         selectSexMaleMap.put("value", selectSexMale);
@@ -84,21 +84,21 @@ public class StatisticalServiceImpl implements IStatisticalService {
         selectSexUser.add(selectSexFemaleMap);
 
         // 城市比例
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(CommConstant.PERSON_REALTY_CONSULTANT);
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
 
         // 转化率, 当前 默认项目收藏
-        Map<String, Object> selectBuildingStatistical = taBuildingMapper.selectBuildingStatistical("save");
+        Map<String, Object> selectBuildingStatistical = taBuildingMapper.selectBuildingStatistical(orgId, "save");
 
         // -------  用户来源 start ------------
 
         // 用户来源 柱状
-        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
+        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
 
         // 用户来源 饼状
         // 来源置业顾问, 来源全民经纪人，自由进入
-        Integer person_realty_consultant = taPersonMapper.selectUserSourcePie(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.PERSON_REALTY_CONSULTANT);
-        Integer person_estate_agent = taPersonMapper.selectUserSourcePie(CommConstant.PERSON_ESTATE_AGENT, CommConstant.PERSON_REALTY_CONSULTANT);
-        Integer person_null = taPersonMapper.selectUserSourcePie(null, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer person_realty_consultant = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer person_estate_agent = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_ESTATE_AGENT, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer person_null = taPersonMapper.selectUserSourcePie(orgId, null, CommConstant.PERSON_REALTY_CONSULTANT);
         Map<String, Object> pieMap = new HashMap<>();
         pieMap.put("person_realty_consultant", person_realty_consultant);
         pieMap.put("person_estate_agent", person_estate_agent);
@@ -127,7 +127,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectActiveUserCount(String dateType, LocalDate startDate, LocalDate endDate) {
+    public ResponseBean selectActiveUserCount(Integer orgId, String dateType, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
 
         String type = null;
@@ -142,7 +142,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         }
 
         // 用户活跃数
-        List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(CommConstant.PERSON_REALTY_CONSULTANT, type, null, null);
+        List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, type, null, null);
         Map<String, Object> map = new HashMap<>();
         map.put("selectActiveUserCount", selectActiveUserCount);
         responseBean.addSuccess(map);
@@ -150,11 +150,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectNewsUserCount(LocalDate startDate, LocalDate endDate) {
+    public ResponseBean selectNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
 
         // 新增用户数
-        List<Map<String, Object>> selectNewsUserCount = taPersonMapper.selectNewsUserCount(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
+        List<Map<String, Object>> selectNewsUserCount = taPersonMapper.selectNewsUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
 
         Map<String, Object> map = new HashMap<>();
         map.put("selectNewsUserCount", selectNewsUserCount);
@@ -165,6 +165,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @Override
     public ResponseBean selectUserBehavior(Integer pageNum,
                                            Integer pageSize,
+                                           Integer orgId,
                                            LocalDate startDate,
                                            LocalDate endDate,
                                            String buildingId,
@@ -174,7 +175,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         ResponseBean responseBean = new ResponseBean();
 
         // 用户行为
-        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate, buildingId, eventType, event, activity);
+        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(orgId, CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate, buildingId, eventType, event, activity);
 
         IPage<TaPersonVisitRecord> page = new Page<>(pageNum, pageSize);
         IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, startDate, endDate, buildingId, eventType, event, activity);
@@ -187,7 +188,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectEventAll(String event, String personId) {
+    public ResponseBean selectEventAll(Integer orgId, String event, String personId) {
         ResponseBean responseBean = new ResponseBean();
 
         List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordMapper.selectEventAll(event, personId);
@@ -196,48 +197,48 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectConversion(String conversion) {
+    public ResponseBean selectConversion(Integer orgId, String conversion) {
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> result = new HashMap<>();
 
         switch (conversion) {
             case CommConstant.BUILDING_SAVE:
-                Map<String, Object> selectBuildingStatisticalSave = taBuildingMapper.selectBuildingStatistical("save");
+                Map<String, Object> selectBuildingStatisticalSave = taBuildingMapper.selectBuildingStatistical(orgId, "save");
                 result.put("data_count", selectBuildingStatisticalSave);
                 break;
             case CommConstant.BUILDING_SHARE:
-                Map<String, Object> selectBuildingStatisticalShare = taBuildingMapper.selectBuildingStatistical("share");
+                Map<String, Object> selectBuildingStatisticalShare = taBuildingMapper.selectBuildingStatistical(orgId,"share");
                 result.put("data_count", selectBuildingStatisticalShare);
                 break;
             case CommConstant.ACTIVITY_SAVE:
-                Map<String, Object> selectBuildingDynamicStatisticalSave = taBuildingDynamicMapper.selectBuildingDynamicStatistical("save");
+                Map<String, Object> selectBuildingDynamicStatisticalSave = taBuildingDynamicMapper.selectBuildingDynamicStatistical(orgId, "save");
                 result.put("data_count", selectBuildingDynamicStatisticalSave);
                 break;
             case CommConstant.ACTIVITY_SHARE:
-                Map<String, Object> selectBuildingDynamicStatisticalShare = taBuildingDynamicMapper.selectBuildingDynamicStatistical("share");
+                Map<String, Object> selectBuildingDynamicStatisticalShare = taBuildingDynamicMapper.selectBuildingDynamicStatistical(orgId, "share");
                 result.put("data_count", selectBuildingDynamicStatisticalShare);
                 break;
             case CommConstant.NEWS_SAVE:
-                Map<String, Object> selectNewsStatisticalSave = taNewsMapper.selectNewsStatistical("save");
+                Map<String, Object> selectNewsStatisticalSave = taNewsMapper.selectNewsStatistical(orgId, "save");
                 result.put("data_count", selectNewsStatisticalSave);
                 break;
 
             case CommConstant.NEWS_SHARE:
-                Map<String, Object> selectNewsStatisticalShare = taNewsMapper.selectNewsStatistical("share");
+                Map<String, Object> selectNewsStatisticalShare = taNewsMapper.selectNewsStatistical(orgId, "share");
                 result.put("data_count", selectNewsStatisticalShare);
                 break;
 
             case CommConstant.ACTIVITY_SIGN:
-                Map<String, Object> selectBuildingDynamicEnlistStatistical = taBuildingDynamicMapper.selectBuildingDynamicEnlistStatistical();
+                Map<String, Object> selectBuildingDynamicEnlistStatistical = taBuildingDynamicMapper.selectBuildingDynamicEnlistStatistical(orgId);
                 result.put("data_count", selectBuildingDynamicEnlistStatistical);
                 break;
 
             case CommConstant.AUTHORIZATION_PHONE:
                 // 总用户数
-                Integer selectUserCount = taPersonMapper.selectUserCount(CommConstant.PERSON_REALTY_CONSULTANT);
+                Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
 
                 // 注册数
-                Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(CommConstant.PERSON_REALTY_CONSULTANT);
+                Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
                 Map<String, Object> userMap = new HashMap<>();
                 userMap.put("pvNum", selectUserCount);
                 userMap.put("registeredCount", selectRegisteredCount);
@@ -251,23 +252,23 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
 
     @Override
-    public ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate) {
+    public ResponseBean selectUserResource(Integer orgId, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
         // 用户来源 柱状
-        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
+        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(orgId, CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
 
         // 用户来源饼状
         // 来源置业顾问, 来源全民经纪人，自由进入
-        Integer person_realty_consultant = taPersonMapper.selectUserSourcePie(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.PERSON_REALTY_CONSULTANT);
-        Integer person_estate_agent = taPersonMapper.selectUserSourcePie(CommConstant.PERSON_ESTATE_AGENT, CommConstant.PERSON_REALTY_CONSULTANT);
-        Integer person_null = taPersonMapper.selectUserSourcePie(null, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer person_realty_consultant = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer person_estate_agent = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_ESTATE_AGENT, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer person_null = taPersonMapper.selectUserSourcePie(orgId, null, CommConstant.PERSON_REALTY_CONSULTANT);
         Map<String, Object> map = new HashMap<>();
         map.put("person_realty_consultant", person_realty_consultant);
         map.put("person_estate_agent", person_estate_agent);
         map.put("person_null", person_null);
 
         // 用户来源 数据列表
-        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(CommConstant.PERSON_ESTATE_AGENT, startDate, endDate);
+        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(orgId, CommConstant.PERSON_ESTATE_AGENT, startDate, endDate);
 
         Map<String, Object> result = new HashMap<>();
         result.put("columnar", mapList);
@@ -280,10 +281,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
 
     @Override
-    public ResponseBean selectUserCount() {
+    public ResponseBean selectUserCount(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         // 总用户数
-        Integer selectUserCount = taPersonMapper.selectUserCount(CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserCount", selectUserCount);
         responseBean.addSuccess(map);
@@ -291,10 +292,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectRegisteredCount() {
+    public ResponseBean selectRegisteredCount(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         // 注册数
-        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
         Map<String, Object> map = new HashMap<>();
         map.put("selectRegisteredCount", selectRegisteredCount);
         responseBean.addSuccess(map);
@@ -302,10 +303,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectRecentlyCount(LocalDate startDate, LocalDate endDate) {
+    public ResponseBean selectRecentlyCount(Integer orgId, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
         // 最近七天
-        Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
+        Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
         Map<String, Object> map = new HashMap<>();
         map.put("selectRecentlyCount", selectRecentlyCount);
         responseBean.addSuccess(map);
@@ -313,13 +314,13 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectSexUser() {
+    public ResponseBean selectSexUser(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
         // 性别比例
         // 1 男 2 女
-        Integer selectSexMale = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
-        Integer selectSexFemale = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
         Map<String, Object> selectSexMaleMap = new HashMap<>();
         selectSexMaleMap.put("name", "男");
         selectSexMaleMap.put("value", selectSexMale);
@@ -337,11 +338,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectCityUser() {
+    public ResponseBean selectCityUser(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
         // 城市比例
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(CommConstant.PERSON_REALTY_CONSULTANT);
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
         Map<String, Object> map = new HashMap<>();
         map.put("selectCityUser", selectCityUser);
         responseBean.addSuccess(map);
@@ -349,11 +350,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, String buildingId) {
+    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<Map<String,Object>> pg = new Page<>(pageNum, pageSize);
-        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, buildingId);
+        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId);
 
         responseBean.addSuccess(page);
         return responseBean;

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -245,8 +245,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId) {
-        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId);
+    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId, Integer orgId) {
+        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId, orgId);
         return ResponseBean.success(signList);
     }
 

src/main/java/com/huiju/estateagents/service/impl/TaBuildingIntentionServiceImpl.java

@@ -27,7 +27,7 @@ public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntent
     private TaBuildingIntentionMapper taBuildingIntentionMapper;
 
     @Override
-    public ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent>tdBizEventsList, String buildingId) {
+    public ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent>tdBizEventsList, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
         // 先删除库中存在的
@@ -45,6 +45,7 @@ public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntent
                 taBuildingIntention.setCreateDate(e.getCreateDate());
                 taBuildingIntention.setBuildingId(buildingId);
                 taBuildingIntention.setStatus(1);
+                taBuildingIntention.setOrgId(orgId);
                 return taBuildingIntention;
         }).collect(Collectors.toList());
 

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -192,30 +192,37 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingUpdate(String parameter) {
+    public ResponseBean buildingUpdate(String parameter, Integer orgId) {
         JSONObject object= JSONObject.parseObject(parameter);
 
         TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
+
+        //图片先删除再添加
         String imgStr = object.getString("img");
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
+        if (CollectionUtils.isNotEmpty(buildingImgs)) {
+            QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
+            buildingIdQueryWrapper.eq("building_id", building.getBuildingId());
+            buildingIdQueryWrapper.eq("org_id", orgId);
+            taBuildingMapper.update(building,buildingIdQueryWrapper);
+            QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
+            BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
+            BuildingImgQueryWrapper.eq("img_type", "banner");
+            taBuildingImgMapper.delete(BuildingImgQueryWrapper);
+            insertImgBatch(buildingImgs, building.getBuildingId());
+        }
 
-        //图片先删除再添加
-        QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
-        buildingIdQueryWrapper.eq("building_id", building.getBuildingId());
-        taBuildingMapper.update(building,buildingIdQueryWrapper);
-        QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
-        BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
-        BuildingImgQueryWrapper.eq("img_type", "banner");
-        taBuildingImgMapper.delete(BuildingImgQueryWrapper);
-        insertImgBatch(buildingImgs, building.getBuildingId());
 
         // tag先删除再增加
         String tagStr = object.getString("tag");
         List<TaBuildingTag> buildingTags = JSONObject.parseArray(tagStr, TaBuildingTag.class);
-        QueryWrapper<TaBuildingTag> BuildingTagQueryWrapper = new QueryWrapper<>();
-        BuildingTagQueryWrapper.eq("building_id", building.getBuildingId());
-        taBuildingTagMapper.delete(BuildingTagQueryWrapper);
-        insertTagBatch(buildingTags, building.getBuildingId());
+        if (CollectionUtils.isNotEmpty(buildingTags)) {
+            QueryWrapper<TaBuildingTag> BuildingTagQueryWrapper = new QueryWrapper<>();
+            BuildingTagQueryWrapper.eq("building_id", building.getBuildingId());
+            taBuildingTagMapper.delete(BuildingTagQueryWrapper);
+            insertTagBatch(buildingTags, building.getBuildingId());
+        }
+
         if(null != building.getCityId()){
             TdCity city = tdCityMapper.selectById(building.getCityId());
             city.setStatus("1");
@@ -227,7 +234,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         taBuildingProjectTypeMapper.deleteByBuildingId(building.getBuildingId());
         JSONArray buildingProjectTypeArray = object.getJSONArray("buildingProjectType");
         if (CollectionUtils.isNotEmpty(buildingProjectTypeArray)) {
-            taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray);
+            taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
         return ResponseBean.success("");
     }
@@ -238,7 +245,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAdd(String parameter) {
+    public ResponseBean buildingAdd(String parameter, Integer orgId) {
         JSONObject object= JSONObject.parseObject(parameter);
 
         TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
@@ -247,6 +254,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(0);
+        building.setOrgId(orgId);
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -273,23 +281,23 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
 
         // 项目类型
-        // 先删除之前关联的
         JSONArray buildingProjectTypeArray = object.getJSONArray("buildingProjectType");
         if (CollectionUtils.isNotEmpty(buildingProjectTypeArray)) {
-            taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray);
+            taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
 
         return ResponseBean.success("");
     }
 
     @Override
-    public ResponseBean buildingUpdateStatus(String parameter) {
+    public ResponseBean buildingUpdateStatus(String parameter, Integer orgId) {
         TaBuilding  building = new TaBuilding();
         JSONObject jsonobject = JSONObject.parseObject(parameter);
         Integer  status= jsonobject.getInteger("status");
         String id = jsonobject.getString("id");
         QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
         buildingIdQueryWrapper.eq("building_id", id);
+        buildingIdQueryWrapper.eq("org_id", orgId);
         building.setBuildingId(id);
         building.setStatus(status);
         taBuildingMapper.update(building,buildingIdQueryWrapper);
@@ -297,7 +305,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingdelete(String id) {
+    public ResponseBean buildingdelete(String id, Integer orgId) {
         TaBuilding  building = new TaBuilding();
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,id);
@@ -308,6 +316,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
         QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
         buildingIdQueryWrapper.eq("building_id", id);
+        buildingIdQueryWrapper.eq("org_id", orgId);
         building.setBuildingId(String.valueOf(id));
         building.setStatus(-1);
         taBuildingMapper.update(building,buildingIdQueryWrapper);
@@ -566,8 +575,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAll() {
-        List<TaBuilding> taBuilding= taBuildingMapper.buildingAll();
+    public ResponseBean buildingAll(Integer orgId) {
+        List<TaBuilding> taBuilding= taBuildingMapper.buildingAll(orgId);
         return ResponseBean.success(taBuilding);
     }
 

src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java

@@ -81,7 +81,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
     }
 
     @Override
-    public ResponseBean addTaNewsType(TaNewsType taNewsType) {
+    public ResponseBean addTaNewsType(TaNewsType taNewsType, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
         //-- 校验 公司，楼盘
@@ -89,6 +89,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
         taNewsType.setCreateDate(LocalDateTime.now());
         taNewsType.setStatus(1);
+        taNewsType.setOrgId(orgId);
         this.save(taNewsType);
         responseBean.addSuccess(taNewsType);
         return responseBean;

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -395,6 +395,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         queryWrapper.eq("recommend_person",customerId);
 //        queryWrapper.eq("building_id",building);
         queryWrapper.eq("status", CommConstant.VERIFY_AGREE);
+        queryWrapper.eq("org_id", orgId);
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
         return taRecommendCustomerMapper.selectPage(page,queryWrapper);
     }

src/main/java/com/huiju/estateagents/service/impl/TaRoleServiceImpl.java

@@ -2,14 +2,13 @@ package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.entity.TaRole;
-import com.huiju.estateagents.entity.TaRoleMenu;
-import com.huiju.estateagents.mapper.TaRoleMapper;
-import com.huiju.estateagents.mapper.TaRoleMenuMapper;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +27,15 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
     @Autowired
     TaRoleMenuMapper taRoleMenuMapper;
 
+    @Autowired
+    SysMenuMapper sysMenuMapper;
+
+    @Autowired
+    SysButtonInMenuMapper sysButtonInMenuMapper;
+
+    @Autowired
+    TaRoleButtonMapper taRoleButtonMapper;
+
     @Override
     public List<TaRole> getRolesByUser(Integer userId) {
         return taRoleMapper.getRolesByUser(userId);
@@ -37,9 +45,29 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
     public TaRole taRoleDetails(Integer id,Integer orgId) {
         TaRole taRole = taRoleMapper.selectById(id);
         // 查询当前角色的所有菜单
-        QueryWrapper<TaRoleMenu> taRoleMenu= new QueryWrapper<>();
-        taRoleMenu.eq("role_id",id);
-        taRoleMenuMapper.selectList(taRoleMenu);
+        QueryWrapper<TaRoleMenu> taRoleMenuQuery= new QueryWrapper<>();
+        taRoleMenuQuery.eq("role_id",id);
+       List<TaRoleMenu> taRoleMenusList = taRoleMenuMapper.selectList(taRoleMenuQuery);
+       // 同过menu_id查询当前菜单
+         List<SysMenu> sysMenuList = new ArrayList<>();
+        for (TaRoleMenu taRoleMenu :taRoleMenusList){
+            SysMenu sysMenu = sysMenuMapper.selectById(taRoleMenu.getMenuId());
+            sysMenuList.add(sysMenu);
+
+            // 查询按钮
+            QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();
+            taRoleButtonQuery.eq("role_id",id);
+            List<TaRoleButton> taRoleButtonList= taRoleButtonMapper.selectList(taRoleButtonQuery);
+            List<SysButtonInMenu> sysButtonInArr = new ArrayList<>();
+            for(TaRoleButton taRoleButton :taRoleButtonList){
+                QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
+                sysButtonInMenuQuery.eq("btn_id",taRoleButton.getBtnId());
+                SysButtonInMenu sysButtonInMenuList= sysButtonInMenuMapper.selectOne(sysButtonInMenuQuery);
+                sysButtonInArr.add(sysButtonInMenuList);
+            }
+            sysMenu.setSysButtonInMenu(sysButtonInArr);
+        }
+        taRole.setSysMenuList(sysMenuList);
         return taRole;
     }
-}
+}

src/main/java/com/huiju/estateagents/service/impl/TdBizEventServiceImpl.java

@@ -26,9 +26,9 @@ public class TdBizEventServiceImpl extends ServiceImpl<TdBizEventMapper, TdBizEv
     private TdBizEventMapper tdBizEventMapper;
 
     @Override
-    public ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId) {
+    public ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
-        IPage<TdBizEvent> page = tdBizEventMapper.selectBizEventAndIntention(pg, buildingId);
+        IPage<TdBizEvent> page = tdBizEventMapper.selectBizEventAndIntention(pg, buildingId, orgId);
         responseBean.addSuccess(page);
         return responseBean;
     }

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper">
         <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
-            select * from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId}
+            select * from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
         </select>
 </mapper>

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -108,6 +108,7 @@
                 sum(share_num) as shareNum
             </if>
             from ta_building_dynamic
+        where org_id = #{orgId}
     </select>
 
     <select id="selectBuildingDynamicEnlistStatistical" resultType="map">
@@ -115,6 +116,7 @@
         sum(pv_num) as pvNum,
         IFNULL(sum(enlist_num),0) as enlistNum
         from ta_building_dynamic
+        where org_id = #{orgId}
     </select>
 
 </mapper>

src/main/resources/mapper/TaBuildingMapper.xml

@@ -65,6 +65,7 @@
     <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">
          SELECT * FROM ta_building
          where status > -1
+         and org_id = #{orgId}
     </select>
 
     <select id="selectBuilding" resultType="com.huiju.estateagents.entity.TaBuilding">
@@ -82,6 +83,7 @@
               IFNULL(sum(share_num),0) as shareNum
           </if>
         from ta_building
+        where org_id = ${orgId}
     </select>
 
     <select id="selectBuildingPage" resultType="com.huiju.estateagents.entity.TaBuilding">

src/main/resources/mapper/TaBuildingProjectTypeMapper.xml

@@ -7,7 +7,7 @@
         (building_id, price, decoration, rights_year, status, building_type_id, building_type_name)
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item.buildingId}, #{item.price}, #{item.decoration}, #{item.rightsYear}
+            (#{buildingId}, #{item.price}, #{item.decoration}, #{item.rightsYear}
             , #{item.status}, #{item.buildingTypeId}, #{item.buildingTypeName})
         </foreach>
     </insert>

src/main/resources/mapper/TaNewsMapper.xml

@@ -13,6 +13,7 @@
             sum(share_num) as shareNum
         </if>
         from ta_news
+        where org_id = #{orgId}
     </select>
 
 </mapper>

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -22,7 +22,7 @@
             SUM(tpir.intention) as intention
         FROM
             ta_person_intention_record tpir
-            LEFT JOIN ta_person tp on tpir.person_id = tp.person_id
+            LEFT JOIN ta_person tp on tpir.person_id = tp.person_id AND tp.org_id = #{orgId}
             <where>
                 <if test="buildingId != null and buildingId != ''">
                     tpir.building_id = #{buildingId}

src/main/resources/mapper/TaPersonMapper.xml

@@ -150,7 +150,8 @@ FROM
             COUNT(1) as activity_count
         FROM
         ta_person tp
-        where ifnull(tp.person_type, '') != #{personType}
+        where tp.org_id = #{org} AND
+          ifnull(tp.person_type, '') != #{personType}
 
         <if test="startDate != null or endDate != null">
             AND  tp.create_date BETWEEN #{startDate} and #{endDate}
@@ -189,7 +190,7 @@ FROM
             FROM
               ta_person tp
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-            where ifnull(tp.person_type, '') != #{personType}
+            where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
             <if test="buildingId != null and buildingId != ''">
                 and tpvr.building_id = #{buildingId}
             </if>
@@ -247,7 +248,7 @@ FROM
              LEFT JOIN
             ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record GROUP BY  person_id  ) as tpvr
             ON tp.person_id = tpvr.person_id
-             where ifnull(tp.person_type, '') != #{personType}
+             where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
              GROUP BY DATE_FORMAT( tpvr.max_visit_time , '%Y-%m-%d' )
         ) AS temp ON
         <if test="dateType == 'month'.toString()">
@@ -328,7 +329,7 @@ FROM
                     tp.create_date as create_date
                 FROM
                  ta_person tp
-                where ifnull(tp.person_type, '') != #{personType}
+                where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
                 <if test="startDate != null or endDate != null">
                     AND tp.create_date BETWEEN #{startDate} and #{endDate}
                 </if>
@@ -348,7 +349,8 @@ FROM
     <select id="selectUserSourcePie" resultType="integer">
         select count(1)
         FROM ta_person
-        WHERE ifnull(person_type, '') != #{personType}
+        WHERE org_id = #{org} AND
+          ifnull(person_type, '') != #{personType}
         <if test="recommendPersonType != null and recommendPersonType != ''">
             and recommend_person_type = #{recommendPersonType}
         </if>
@@ -364,6 +366,7 @@ FROM
             LEFT JOIN td_person_from tpfs
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tpf.from_code and tps.phone is NOT NULL
+            AND tps.org_id = #{org}
             and ifnull(tps.person_type, '') != #{personType}
             <if test="startDate != null or endDate != null">
                 and tps.create_date BETWEEN #{startDate} and #{endDate}
@@ -379,6 +382,7 @@ FROM
             LEFT JOIN td_person_from tpfs
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tpf.from_code
+            AND tps.org_id = #{org}
             and ifnull(tps.person_type, '') != #{personType}
             <if test="startDate != null or endDate != null">
                 and tps.create_date BETWEEN #{startDate} and #{endDate}
@@ -391,7 +395,7 @@ FROM
         FROM td_person_from tpf
         LEFT JOIN ta_person tp
         ON tp.from_code = tpf.from_code
-        where ifnull(tp.person_type, '') != #{personType}
+        where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
         GROUP BY tpf.from_code
     </select>
 
@@ -434,6 +438,7 @@ FROM
             LEFT JOIN td_person_from tpfs
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
+            AND tps.org_id = #{org}
             and ifnull(tps.person_type, '') != 'Realty Consultant'
             AND tps.create_date BETWEEN #{startDate} AND #{endDate}
 
@@ -451,6 +456,7 @@ FROM
             LEFT JOIN td_person_from tpfs
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
+                AND tps.org_id = #{org}
                 and ifnull(tps.person_type, '') != 'Realty Consultant'
                 AND tps.create_date BETWEEN #{startDate} AND #{endDate}
                 and tps.phone is not null

src/main/resources/mapper/TaRoleButtonMapper.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaRoleButtonMapper">
-
+<delete  id="deleteCurrentBut">
+    delete from ta_role_button where ta_role_button.role_id = #{roleId}
+</delete >
 </mapper>

src/main/resources/mapper/TdBizEventMapper.xml

@@ -25,6 +25,9 @@
                 <if test="buildingId != null and buildingId != ''">
                     tbi.building_id = #{buildingId}
                 </if>
+                <if test="orgId != null">
+                    and tbi.org_id = #{orgId}
+                </if>
             </trim>
         ) as building_intention