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

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+import com.huiju.estateagents.center.taUser.service.ITaButtonUriMapService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 按钮路由映射表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@RestController
+@RequestMapping("/")
+public class TaButtonUriMapController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaButtonUriMapController.class);
+
+    @Autowired
+    public ITaButtonUriMapService iTaButtonUriMapService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taButtonUriMap",method= RequestMethod.GET)
+    public ResponseBean taButtonUriMapList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaButtonUriMap> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaButtonUriMap> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaButtonUriMap> result = iTaButtonUriMapService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taButtonUriMap 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taButtonUriMap",method= RequestMethod.POST)
+    public ResponseBean taButtonUriMapAdd(@RequestBody TaButtonUriMap taButtonUriMap){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaButtonUriMapService.save(taButtonUriMap)){
+                responseBean.addSuccess(taButtonUriMap);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taButtonUriMap/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taButtonUriMapDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaButtonUriMapService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taButtonUriMap 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taButtonUriMap/{id}",method= RequestMethod.PUT)
+    public ResponseBean taButtonUriMapUpdate(@PathVariable Integer id,
+                                        @RequestBody TaButtonUriMap taButtonUriMap){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaButtonUriMapService.updateById(taButtonUriMap)){
+                responseBean.addSuccess(taButtonUriMap);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taButtonUriMap/{id}",method= RequestMethod.GET)
+    public ResponseBean taButtonUriMapGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaButtonUriMapService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -6,6 +6,7 @@ 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;
@@ -65,6 +66,9 @@ public class TaUserAuthMenuController extends BaseController {
         Integer userId = Object.getInteger("id");
         JSONArray JSONArray = Object.getJSONArray("sysMenu");
         List<SysMenu> sysMenuList = JSONArray.toJavaList(SysMenu.class);
-        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList,name,getOrgId(request));
+
+        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/entity/TaButtonUriMap.java

@@ -0,0 +1,40 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 按钮路由映射表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaButtonUriMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 按钮
+     */
+    private String buttonCode;
+
+    /**
+     * uri
+     */
+    private String uri;
+
+    /**
+     * 说明
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 按钮路由映射表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@Mapper
+public interface TaButtonUriMapMapper extends BaseMapper<TaButtonUriMap> {
+	
+	TaButtonUriMap getByURI(@Param("uri") String uri);
+}

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+
+/**
+ * <p>
+ * 按钮路由映射表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+public interface ITaButtonUriMapService extends IService<TaButtonUriMap> {
+	
+	TaButtonUriMap getByURI(String uri);
+}

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,String name,Integer orgid);
+    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList,String name,Integer orgid,List<SysButtonInMenu> sysButtonInMenuList);
 }

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

@@ -0,0 +1,28 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+import com.huiju.estateagents.center.taUser.mapper.TaButtonUriMapMapper;
+import com.huiju.estateagents.center.taUser.service.ITaButtonUriMapService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 按钮路由映射表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@Service
+public class TaButtonUriMapServiceImpl extends ServiceImpl<TaButtonUriMapMapper, TaButtonUriMap> implements ITaButtonUriMapService {
+	
+	@Autowired
+	private TaButtonUriMapMapper taButtonUriMapMapper;
+	
+	@Override
+	public TaButtonUriMap getByURI(String uri) {
+		return taButtonUriMapMapper.getByURI(uri);
+	}
+}

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

@@ -9,14 +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.TaRole;
-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;
@@ -41,6 +41,9 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     @Autowired
     private  TaRoleMapper taRoleMapper;
 
+    @Autowired
+    private TaRoleButtonMapper taRoleButtonMapper;
+
     /**
      * 根据用户id获取授权菜单
      * @param pageNum
@@ -77,16 +80,15 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     }
 
     @Override
-    public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgid) {
+    public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
         ResponseBean responseBean = new ResponseBean();
         if (null == roleId){
-            Boolean isA = addUserAuthMenu( sysMenuList,name,orgid);
-            responseBean.addSuccess(isA==true?"成功":"失败");
+            addUserAuthMenu( sysMenuList,name,orgId,sysButtonInMenuList);
             return responseBean;
         }
         try {
             //授权菜单，先删除在新增
-            taUserAuthMenuMapper.deleteUserAuthMenu(roleId);
+            taRoleMenuMapper.deleteCurrentMenu(roleId);
             for (SysMenu sysMenu: sysMenuList) {
                 TaRoleMenu taRoleMenu = new TaRoleMenu();
                 taRoleMenu.setRoleId(roleId);
@@ -97,9 +99,18 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
             TaRole taRole = new TaRole();
             taRole.setRoleId(roleId);
             taRole.setRoleName(name);
-            taRole.setOrgId(orgid);
             taRoleMapper.updateById(taRole);
-            responseBean.addSuccess("操作成功");
+
+            // 当前角色的所有按钮再重新插入
+
+            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("操作失败");
@@ -108,18 +119,29 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
         }
     }
 
-    public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgid) {
+    public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
         ResponseBean responseBean = new ResponseBean();
         try{
+            // 新增角色
             TaRole taRole = new TaRole();
             taRole.setRoleName(name);
-            taRole.setOrgId(orgid);
+            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  true;

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

@@ -581,12 +581,12 @@ public class TaPersonController extends BaseController {
     
     /**
      * 微信添加人员添加城市
-     * @param location
+     * @param params
      * @param request
      * @return
      */
     @PutMapping("/wx/person/city")
-    public ResponseBean updatePersonCity(@RequestBody String location, HttpServletRequest request) {
+    public ResponseBean updatePersonCity(@RequestBody String params, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -594,9 +594,12 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        JSONObject jsonObject = JSONObject.parseObject(location);
+        JSONObject jsonObject = JSONObject.parseObject(params);
+        String lat = jsonObject.getString("lat");
+        String lon = jsonObject.getString("lon");
+        String location = lon+","+lat;
         RestTemplate restTemplate = new RestTemplate();
-        String result = restTemplate.getForObject("https://restapi.amap.com/v3/geocode/regeo?key="+ CommConstant.GD_KEY + "&location=" + jsonObject.getString("location") + "&output=json", String.class);
+        String result = restTemplate.getForObject("https://restapi.amap.com/v3/geocode/regeo?key="+ CommConstant.GD_KEY + "&location=" +location+ "&output=json", String.class);
         JSONObject resultJson = JSONObject.parseObject(result);
         if (!resultJson.getString("status").equals(CommConstant.STATUS_NORMAL)){
             String adcode =  resultJson.getJSONObject("regeocode").getJSONObject("addressComponent").getString("adcode");

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

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

@@ -47,7 +47,9 @@ public class SysButtonInMenu implements Serializable {
     private Integer status;
 
     private String code;
-
+    
+    private String remark;
+    
     @TableField(exist = false)
     private List<Integer> roles;
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -1,10 +1,20 @@
 package com.huiju.estateagents.interceptor;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.service.ITaButtonUriMapService;
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.TaRoleButton;
+import com.huiju.estateagents.service.ISysButtonInMenuService;
+import com.huiju.estateagents.service.ITaRoleButtonService;
 import io.jsonwebtoken.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -13,6 +23,8 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class AccessInterceptor implements HandlerInterceptor {
@@ -20,6 +32,18 @@ public class AccessInterceptor implements HandlerInterceptor {
     @Autowired
     private ISysTokenService sysTokenService;
     
+    @Autowired
+    private ITaUserRoleService taUserRoleService;
+    
+    @Autowired
+    private ITaRoleButtonService taRoleButtonService;
+    
+    @Autowired
+    private ISysButtonInMenuService sysButtonInMenuService;
+    
+    @Autowired
+    private ITaButtonUriMapService taButtonUriMapService;
+    
     private String[] whiteList = {
             "/wx/chat", // 聊天暂时不鉴权
             "/api/wx/login",
@@ -112,9 +136,64 @@ public class AccessInterceptor implements HandlerInterceptor {
             return false;
         }
         
+//        按钮权限校验
+        boolean state = checkButtonRole(request);
+        if (!state){
+            ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
+
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+        
         return true;
     }
-
+    
+    //检验按钮权限
+    private boolean checkButtonRole(HttpServletRequest request) {
+        if(StringUtils.isEmpty(request.getHeader("x-action"))){
+            return false;
+        }
+        //根据路径匹配code 一致继续 否则无权限
+        String requestURI = request.getRequestURI();
+        String method = request.getMethod();
+        TaButtonUriMap taButtonUriMap = taButtonUriMapService.getByURI(method+":"+requestURI);
+        if (null == taButtonUriMap){
+            return true;
+        }
+        
+        if (!taButtonUriMap.getButtonCode().equals(request.getHeader("x-action"))){
+            return false;
+        }
+        
+        //根据code查询按钮权限
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        QueryWrapper<SysButtonInMenu> sysButtonInMenuQueryWrapper = new QueryWrapper<>();
+        sysButtonInMenuQueryWrapper.eq("code",request.getHeader("x-action"));
+        SysButtonInMenu sysButtonInMenu = sysButtonInMenuService.getOne(sysButtonInMenuQueryWrapper);
+        if (null == sysButtonInMenu){
+            return false;
+        }
+        //查询角色
+        QueryWrapper<TaRoleButton> taRoleButtonQueryWrapper = new QueryWrapper<>();
+        taRoleButtonQueryWrapper.eq("btn_id",sysButtonInMenu.getBtnId());
+        List<TaRoleButton> taRoleButtonList = taRoleButtonService.list(taRoleButtonQueryWrapper);
+        if (taRoleButtonList.size() < 1){
+            return true;
+        }
+        //查询用户
+        QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
+        taUserRoleQueryWrapper.eq("user_id",map.get("userId"));
+        TaUserRole taUserRole = taUserRoleService.getOne(taUserRoleQueryWrapper);
+        for (TaRoleButton taRoleButton : taRoleButtonList){
+            if (taRoleButton.getRoleId().equals(taUserRole.getRoleId())){
+                return true;
+            }
+        }
+        
+        return false;
+    }
+    
     private boolean checkMiniApp(HttpServletRequest request) {
         String requestURI = request.getRequestURI();
 

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

@@ -2,7 +2,11 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.TaRoleButton;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,5 +18,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface SysButtonInMenuMapper extends BaseMapper<SysButtonInMenu> {
-
+	
+	List<SysButtonInMenu> getButtonList(@Param("roleId") Integer roleId);
 }

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/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);
 
     /**
      * 查询当前楼盘

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/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/TaRoleMenuMapper.java

@@ -15,4 +15,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaRoleMenuMapper extends BaseMapper<TaRoleMenu> {
 
+    /**
+     * 先删除再添加
+     * @param roleId
+     */
+    void deleteCurrentMenu(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/ISysButtonInMenuService.java

@@ -2,6 +2,9 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.TaRoleButton;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +15,6 @@ import com.huiju.estateagents.entity.SysButtonInMenu;
  * @since 2019-09-11
  */
 public interface ISysButtonInMenuService extends IService<SysButtonInMenu> {
-
+	
+	List<SysButtonInMenu> getButtonList(Integer roleId);
 }

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/SysButtonInMenuServiceImpl.java

@@ -2,10 +2,14 @@ package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.TaRoleButton;
 import com.huiju.estateagents.mapper.SysButtonInMenuMapper;
 import com.huiju.estateagents.service.ISysButtonInMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 菜单按钮表  服务实现类
@@ -16,5 +20,12 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysButtonInMenuServiceImpl extends ServiceImpl<SysButtonInMenuMapper, SysButtonInMenu> implements ISysButtonInMenuService {
-
+	
+	@Autowired
+	private SysButtonInMenuMapper sysButtonInMenuMapper;
+	
+	@Override
+	public List<SysButtonInMenu> getButtonList(Integer roleId) {
+		return sysButtonInMenuMapper.getButtonList(roleId);
+	}
 }

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,8 @@ 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.SysButtonInMenu;
-import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaRole;
-import com.huiju.estateagents.entity.TaRoleMenu;
-import com.huiju.estateagents.mapper.SysButtonInMenuMapper;
-import com.huiju.estateagents.mapper.SysMenuMapper;
-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;
@@ -39,6 +33,9 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
     @Autowired
     SysButtonInMenuMapper sysButtonInMenuMapper;
 
+    @Autowired
+    TaRoleButtonMapper taRoleButtonMapper;
+
     @Override
     public List<TaRole> getRolesByUser(Integer userId) {
         return taRoleMapper.getRolesByUser(userId);
@@ -56,12 +53,19 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
         for (TaRoleMenu taRoleMenu :taRoleMenusList){
             SysMenu sysMenu = sysMenuMapper.selectById(taRoleMenu.getMenuId());
             sysMenuList.add(sysMenu);
-            // 查询按钮
-            QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
-            sysButtonInMenuQuery.eq("menu_id",sysMenu.getMenuId());
-            List<SysButtonInMenu> sysButtonInMenuList= sysButtonInMenuMapper.selectList(sysButtonInMenuQuery);
-            sysMenu.setSysButtonInMenu(sysButtonInMenuList);
 
+            // 查询按钮
+            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/SysButtonInMenuMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.SysButtonInMenuMapper">
 
+    <select id="getButtonList" resultType="com.huiju.estateagents.entity.SysButtonInMenu">
+        SELECT
+            t.serial_no,
+            s.*
+        FROM
+            ta_role_button t
+            LEFT JOIN sys_button_in_menu s ON t.btn_id = s.btn_id
+        WHERE
+            t.role_id = #{roleId}
+    </select>
 </mapper>

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/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">

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/TaButtonUriMapMapper.xml

@@ -0,0 +1,13 @@
+<?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.center.taUser.mapper.TaButtonUriMapMapper">
+
+    <select id="getByURI" resultType="com.huiju.estateagents.center.taUser.entity.TaButtonUriMap">
+        SELECT
+            *
+        FROM
+            ta_button_uri_map
+        WHERE
+            #{uri} REGEXP uri
+    </select>
+</mapper>

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/TaRoleMenuMapper.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.TaRoleMenuMapper">
-
+    <delete  id="deleteCurrentMenu">
+    delete from ta_role_menu where ta_role_menu.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