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

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

 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 
 /**
                                           @RequestParam(value = "contentType", required = false) String contentType,
                                           @RequestParam(value = "showPosition", required = false) String showPosition,
                                           @RequestParam(value = "status", required = false) Integer status,
-                                          @RequestParam(value = "showType", required = false) String showType){
+                                          @RequestParam(value = "showType", required = false) String showType,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
             IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(StringUtils.isNotBlank(contentType), "content_type", contentType);
             queryWrapper.eq(StringUtils.isNotBlank(showPosition), "show_position", showPosition);
             queryWrapper.eq(null!=status, "status", status);
+            queryWrapper.eq( "org_id", getOrgId(request));
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
      * @return
      */
     @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
-    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
+    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent, HttpServletRequest request){
         Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
         extendContent.setCityId(cityId);
         extendContent.setCreateDate(LocalDateTime.now());
+        extendContent.setOrgId(getOrgId(request));
         ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
           responseBean.addSuccess(extendContent);
           return responseBean;
      */
     @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.PUT)
     public ResponseBean extendContentUpdate(@PathVariable Integer id,
-                                        @RequestBody ExtendContent extendContent){
+                                        @RequestBody ExtendContent extendContent,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         extendContent.setContentId(id);
         try {
             Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
             extendContent.setCityId(cityId);
+            extendContent.setOrgId(getOrgId(request));
             if (iExtendContentService.updateById(extendContent)){
                 responseBean.addSuccess(extendContent);
             }else {