根据不同角色进入不同的信息功能模块

Yijia-SaaS/yijia-customer/pom.xml

@@ -26,6 +26,10 @@
             <groupId>com.yijia</groupId>
             <artifactId>yijia-quartz</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yijia</groupId>
+            <artifactId>yijia-system</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/controller/CustomerGradeSettingController.java

@@ -1,6 +1,11 @@
 package com.yijia.customer.controller;
 
+import java.util.Arrays;
 import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +37,8 @@ public class CustomerGradeSettingController extends BaseController
 {
     @Autowired
     private ICustomerGradeSettingService customerGradeSettingService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询客户优惠等级设置列表
      */
@@ -40,6 +46,12 @@ public class CustomerGradeSettingController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CustomerGradeSetting customerGradeSetting)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            customerGradeSetting.setStationIdList(list);
+        }
         startPage();
         List<CustomerGradeSetting> list = customerGradeSettingService.selectCustomerGradeSettingList(customerGradeSetting);
         return getDataTable(list);
@@ -53,6 +65,12 @@ public class CustomerGradeSettingController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CustomerGradeSetting customerGradeSetting)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            customerGradeSetting.setStationIdList(list);
+        }
         List<CustomerGradeSetting> list = customerGradeSettingService.selectCustomerGradeSettingList(customerGradeSetting);
         ExcelUtil<CustomerGradeSetting> util = new ExcelUtil<CustomerGradeSetting>(CustomerGradeSetting.class);
         return util.exportExcel(list, "setting");

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/controller/CustomerManageController.java

@@ -1,7 +1,10 @@
 package com.yijia.customer.controller;
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
 import com.yijia.common.utils.poi.ExcelUtil;
 import com.yijia.customer.domain.CustomerManage;
 import com.yijia.customer.service.ICustomerManageService;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,6 +22,7 @@ import com.yijia.common.enums.BusinessType;
 
 import com.yijia.common.core.page.TableDataInfo;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -33,7 +37,8 @@ public class CustomerManageController extends BaseController
 {
     @Autowired
     private ICustomerManageService customerManageService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询客户管理列表
      */
@@ -41,6 +46,12 @@ public class CustomerManageController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CustomerManage customerManage)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            customerManage.setStationIdList(list);
+        }
         startPage();
         List<CustomerManage> list = customerManageService.selectCustomerManageList(customerManage);
         return getDataTable(list);
@@ -54,6 +65,12 @@ public class CustomerManageController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CustomerManage customerManage)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            customerManage.setStationIdList(list);
+        }
         List<CustomerManage> list = customerManageService.selectCustomerManageList(customerManage);
         ExcelUtil<CustomerManage> util = new ExcelUtil<CustomerManage>(CustomerManage.class);
         return util.exportExcel(list, "manage");

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/domain/CustomerGradeSetting.java

@@ -1,6 +1,8 @@
 package com.yijia.customer.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -101,7 +103,20 @@ public class CustomerGradeSetting extends BaseEntity
     @Excel(name = "会员条件结束值")
     private Long memberConditEnd;
 
-    public void setId(Long id) 
+    /**
+     * 根据用户所属组织，平台，集团，油站查询条件
+     */
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/domain/CustomerManage.java

@@ -2,6 +2,8 @@ package com.yijia.customer.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -130,7 +132,20 @@ public class CustomerManage extends BaseEntity
     @Excel(name = "微信UnionID")
     private String unionId;
 
-    public void setId(Long id) 
+    /**
+     * 根据用户所属组织，平台，集团，油站查询条件
+     */
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

Yijia-SaaS/yijia-market/pom.xml

@@ -25,6 +25,10 @@
             <groupId>com.yijia</groupId>
             <artifactId>yijia-quartz</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yijia</groupId>
+            <artifactId>yijia-system</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

Yijia-SaaS/yijia-market/src/main/java/com/yijia/market/controller/MarkertPlanController.java

@@ -1,6 +1,11 @@
 package com.yijia.market.controller;
 
+import java.util.Arrays;
 import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +37,8 @@ public class MarkertPlanController extends BaseController
 {
     @Autowired
     private IMarkertPlanService markertPlanService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询营销方案列表
      */
@@ -40,6 +46,12 @@ public class MarkertPlanController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(MarkertPlan markertPlan)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            markertPlan.setStationIdList(list);
+        }
         startPage();
         List<MarkertPlan> list = markertPlanService.selectMarkertPlanList(markertPlan);
         return getDataTable(list);
@@ -53,6 +65,12 @@ public class MarkertPlanController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(MarkertPlan markertPlan)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            markertPlan.setStationIdList(list);
+        }
         List<MarkertPlan> list = markertPlanService.selectMarkertPlanList(markertPlan);
         ExcelUtil<MarkertPlan> util = new ExcelUtil<MarkertPlan>(MarkertPlan.class);
         return util.exportExcel(list, "plan");

Yijia-SaaS/yijia-market/src/main/java/com/yijia/market/controller/MarketCouponController.java

@@ -1,6 +1,10 @@
 package com.yijia.market.controller;
 
 import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +36,8 @@ public class MarketCouponController extends BaseController
 {
     @Autowired
     private IMarketCouponService marketCouponService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询优惠劵管理列表
      */
@@ -40,6 +45,11 @@ public class MarketCouponController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(MarketCoupon marketCoupon)
     {
+//        LoginUser currentUser = SecurityUtils.getLoginUser();
+//        boolean flag= sysUserService.getUserRole(currentUser);
+//        if(!flag){
+//            marketCoupon.setStationId(currentUser.getUser().getDeptId());
+//        }
         startPage();
         List<MarketCoupon> list = marketCouponService.selectMarketCouponList(marketCoupon);
         return getDataTable(list);

Yijia-SaaS/yijia-market/src/main/java/com/yijia/market/domain/MarkertPlan.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.yijia.common.annotation.Excel;
 import com.yijia.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 营销方案对象 markert_plan
  * 
@@ -66,6 +68,19 @@ public class MarkertPlan extends BaseEntity
     @Excel(name = "状态", readConverterExp = "1=.在用状态，2，删除")
     private String status;
 
+    /**
+     * 根据用户所属组织，平台，集团，油站查询条件
+     */
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
     public void setId(Long id) 
     {
         this.id = id;