楼盘，项目类型，orgId

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

                                      @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));
     }
 
     /**
                                      @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));
     }
 
     /**
      * @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));
     }
 
     /**
      * @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));
     }
 
     /**
      * @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));
     }
 
     /**
      * 查询当前所有项目
      */
     @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/TdBuildingTypeController.java

 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 项目类型字典表  前端控制器
      */
     @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 {
             //使用分页插件
             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);
      * @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 {
      */
     @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/mapper/TaBuildingMapper.java

     @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/service/ITaBuildingService.java

      * @param parameter
      * @return
      */
-    ResponseBean buildingUpdate(String parameter);
+    ResponseBean buildingUpdate(String parameter, Integer orgId);
 
     /**
      *
      * @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);
 
 
     /**
      * 查询所有项目
      * @return
      */
-    ResponseBean buildingAll();
+    ResponseBean buildingAll(Integer orgId);
 
     Integer getCityById(String buildingId);
 }

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

     }
 
     @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);
     }
 
     @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);
         }
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(0);
+        building.setOrgId(orgId);
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     @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);
     }
 
     @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);
         }
         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);
     }
 
     @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/resources/mapper/TaBuildingMapper.xml

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