优惠券，权限相关

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/DataInter.java

@@ -13,4 +13,9 @@ public interface DataInter {
      void setDataCompanyIds(List<Integer> dataCompanyIds);
 
      void setDataCorporationIds(List<Integer> dataCorporationIds);
+
+     Integer getBizType();
+
+     void setBizType(Integer bizType);
+
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/DataInterBean.java

@@ -8,4 +8,5 @@ import java.util.List;
 public class DataInterBean implements DataInter {
     private List<Integer> DataCompanyIds;
     private List<Integer> DataCorporationIds;
+    private Integer bizType;
 }
\ No newline at end of file

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/User.java

@@ -92,7 +92,7 @@ public class User {
     private String dataCorporation;
 
     @Column(name = "biz_type")
-    private String bizType;
+    private Integer bizType;
 
     private String attr1;
 

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/rest/UserRestInterface.java

@@ -61,6 +61,7 @@ public interface UserRestInterface  {
         if (userDTO == null) {
             return;
         }
+        dataInter.setBizType(userDTO.getBizType());
         Integer dataAll=userDTO.getDataAll()== null ? 2 : userDTO.getDataAll();
         System.out.println("---dataAll==="+dataAll);
         if (dataAll == 2){

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/CouponFindDTO.java

@@ -3,6 +3,8 @@ package com.xxfc.platform.activity.dto;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author libin
  * @version 1.0
@@ -19,4 +21,8 @@ public class CouponFindDTO  extends PageParam {
      private Integer type;
 
      private Integer status;
+
+     private List<Integer> companyIds;
+
+     private Integer bizType;
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/CouponBiz.java

 package com.xxfc.platform.activity.biz;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -66,6 +67,9 @@ public class CouponBiz extends BaseBiz<CouponMapper, Coupon> {
         if (Objects.nonNull(couponFindDTO.getStatus())){
             criteria.andEqualTo("status",couponFindDTO.getStatus());
         }
+        if(CollUtil.isNotEmpty(couponFindDTO.getCompanyIds())) {
+            criteria.andIn("companyIds", couponFindDTO.getCompanyIds());
+        }
         criteria.andEqualTo("isDel",0);
         example.setOrderByClause("crt_time DESC");
 

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/CouponAdminController.java

 package com.xxfc.platform.activity.rest.admin;
 
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.DataInterBean;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.activity.biz.CouponBiz;
 import com.xxfc.platform.activity.dto.CouponDTO;
@@ -9,6 +12,7 @@ import com.xxfc.platform.activity.dto.CouponFindDTO;
 import com.xxfc.platform.activity.vo.CouponPagVo;
 import com.xxfc.platform.activity.vo.CouponTitleVo;
 import com.xxfc.platform.activity.vo.CouponVo;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,14 +27,26 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/admin/coupon")
-public class CouponAdminController {
+public class CouponAdminController implements UserRestInterface {
 
     @Autowired
     private CouponBiz couponBiz;
 
+    @Autowired
+    UserFeign userFeign;
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
     @ApiOperation("优惠券列表")
     @GetMapping("/page")
     public ObjectRestResponse<PageDataVO<CouponPagVo>> listCouponWithPage(CouponFindDTO couponFindDTO) {
+        DataInterBean dataInterBean = getDataInter();
+        couponFindDTO.setBizType(dataInterBean.getBizType());
+        couponFindDTO.setCompanyIds(dataInterBean.getDataCompanyIds());
+        //设置参数过滤
         PageDataVO<CouponPagVo> couponPage = couponBiz.listCouponWithPage(couponFindDTO);
         return ObjectRestResponse.succ(couponPage);
     }