taGoods

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

@@ -58,7 +58,7 @@ public class TaGoodsController extends BaseController {
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
                                     @RequestParam(value ="priceLesser",required = false) Integer priceLesser,
                                     @RequestParam(value ="priceGreater",required = false) Integer priceGreater,
-                                    @RequestParam(value ="status",required = false) Integer status){
+                                    @RequestParam(value ="status",required = false) Integer status,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -68,6 +68,7 @@ public class TaGoodsController extends BaseController {
             queryWrapper.lt(null!=priceGreater,"point_price",priceGreater);
             queryWrapper.gt(null != priceLesser,"point_price",priceLesser);
             queryWrapper.eq(null != status,"status",status);
+            queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
             queryWrapper.orderByDesc("create_date");
 
@@ -87,13 +88,13 @@ public class TaGoodsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taGoods/add",method= RequestMethod.POST)
-    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
 
             Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
             taGoods.setCityId(cityId);
-
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.save(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {
@@ -135,13 +136,13 @@ public class TaGoodsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taGoods",method= RequestMethod.PUT)
-    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
 
             Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
             taGoods.setCityId(cityId);
-
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.updateById(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {
@@ -161,7 +162,7 @@ public class TaGoodsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taGoods/change",method= RequestMethod.PUT)
-    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             if(null != taGoods.getStatus() && taGoods.getStatus().equals(CommConstant.STATUS_NORMAL)){
@@ -169,6 +170,7 @@ public class TaGoodsController extends BaseController {
             }else {
                 taGoods.setStatus(CommConstant.STATUS_NORMAL);
             }
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.updateById(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {

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

@@ -19,6 +19,7 @@ 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;
 import java.time.LocalDateTime;
 
 /**
@@ -57,7 +58,7 @@ public class TaPointsExchangeController extends BaseController {
                                              @RequestParam(value ="startVerifyDate",required = false) String startVerifyDate,
                                              @RequestParam(value ="endVerifyDate",required = false) String endVerifyDate,
                                              @RequestParam(value ="status",required = false) Integer status,
-                                             @RequestParam(value ="tel",required = false) String tel){
+                                             @RequestParam(value ="tel",required = false) String tel, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -72,6 +73,7 @@ public class TaPointsExchangeController extends BaseController {
             taPointsExchange.setEndVerifyDate(endVerifyDate);
             taPointsExchange.setStatus(status);
             taPointsExchange.setTel(tel);
+            taPointsExchange.setOrgId(getOrgId(request));
             
             responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
 

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -28,6 +28,9 @@
         <if test="taPointsExchange.status != null and taPointsExchange.status != '' or taPointsExchange.status ==0">
             and  t.`status` = #{taPointsExchange.status}
         </if>
+        <if test="taPointsExchange.orgId != null and taPointsExchange.orgId != ''">
+            and  t.org_id = #{taPointsExchange.orgId}
+        </if>
         <if test="taPointsExchange.personName != null and taPointsExchange.personName != ''">
             and  t.person_name like concat('%',#{taPointsExchange.personName},'%')
         </if>