优化获取当前登录人油站信息

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerCardRecordConsumptionController.java

@@ -40,7 +40,6 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 查询客户电子会员卡消费记录列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:consumption:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerCardRecordConsumption customerCardRecordConsumption)
     {
@@ -59,7 +58,6 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 导出客户电子会员卡消费记录列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:consumption:export')")
     @Log(title = "客户电子会员卡消费记录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CustomerCardRecordConsumption customerCardRecordConsumption)

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerCardRecordRechargeController.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import com.yijia.common.constant.HttpStatus;
 import com.yijia.common.core.domain.entity.SysDept;
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
 import com.yijia.system.service.ISysDeptService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -42,46 +44,45 @@ public class CustomerCardRecordRechargeController extends BaseController
     /**
      * 查询客户电子会员卡充值记录列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:recharge:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerCardRecordRecharge customerCardRecordRecharge)
     {
-        if(customerCardRecordRecharge!=null &&customerCardRecordRecharge.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerCardRecordRecharge.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerCardRecordRecharge.setStationIdList(list);
             customerCardRecordRecharge.setStationId(null);
         }
         startPage();
-        List<CustomerCardRecordRecharge> list = customerCardRecordRechargeService.selectCustomerCardRecordRechargeList(customerCardRecordRecharge);
-        return getDataTable(list);
+        List<CustomerCardRecordRecharge> rechargeList = customerCardRecordRechargeService.selectCustomerCardRecordRechargeList(customerCardRecordRecharge);
+        return getDataTable(rechargeList);
     }
 
     /**
      * 导出客户电子会员卡充值记录列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:recharge:export')")
     @Log(title = "客户电子会员卡充值记录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CustomerCardRecordRecharge customerCardRecordRecharge)
     {
-        if(customerCardRecordRecharge!=null &&customerCardRecordRecharge.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerCardRecordRecharge.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerCardRecordRecharge.setStationIdList(list);
             customerCardRecordRecharge.setStationId(null);
         }
-        List<CustomerCardRecordRecharge> list = customerCardRecordRechargeService.selectCustomerCardRecordRechargeList(customerCardRecordRecharge);
+        List<CustomerCardRecordRecharge> rechargeList = customerCardRecordRechargeService.selectCustomerCardRecordRechargeList(customerCardRecordRecharge);
         ExcelUtil<CustomerCardRecordRecharge> util = new ExcelUtil<CustomerCardRecordRecharge>(CustomerCardRecordRecharge.class);
-        return util.exportExcel(list, "recharge");
+        return util.exportExcel(rechargeList, "recharge");
     }
 
     /**
      * 获取客户电子会员卡充值记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('customer:recharge:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -91,7 +92,6 @@ public class CustomerCardRecordRechargeController extends BaseController
     /**
      * 新增客户电子会员卡充值记录
      */
-    @PreAuthorize("@ss.hasPermi('customer:recharge:add')")
     @Log(title = "客户电子会员卡充值记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CustomerCardRecordRecharge customerCardRecordRecharge)
@@ -102,7 +102,6 @@ public class CustomerCardRecordRechargeController extends BaseController
     /**
      * 修改客户电子会员卡充值记录
      */
-    @PreAuthorize("@ss.hasPermi('customer:recharge:edit')")
     @Log(title = "客户电子会员卡充值记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerCardRecordRecharge customerCardRecordRecharge)
@@ -113,7 +112,6 @@ public class CustomerCardRecordRechargeController extends BaseController
     /**
      * 删除客户电子会员卡充值记录
      */
-    @PreAuthorize("@ss.hasPermi('customer:recharge:remove')")
     @Log(title = "客户电子会员卡充值记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -124,14 +122,14 @@ public class CustomerCardRecordRechargeController extends BaseController
     /**
      * 获取客户电子会员卡充值汇总金额
      */
-    @PreAuthorize("@ss.hasPermi('customer:recharge:czAmtQuery')")
     @GetMapping(value = "czAmtQuery")
     public AjaxResult czAmtQuery(CustomerCardRecordRecharge customerCardRecordRecharge)
     {
-        if(customerCardRecordRecharge!=null &&customerCardRecordRecharge.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerCardRecordRecharge.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerCardRecordRecharge.setStationIdList(list);
             customerCardRecordRecharge.setStationId(null);
         }
@@ -142,29 +140,28 @@ public class CustomerCardRecordRechargeController extends BaseController
     /**
      * 获取客户电子会员卡消费汇总折线图消费数据
      */
-    @PreAuthorize("@ss.hasPermi('customer::listQydataCZ')")
     @GetMapping(value = "listQydataCZ")
     public TableDataInfo listQydataCZ(CustomerCardRecordRecharge customerCardRecordRecharge)
     {
-        if(customerCardRecordRecharge!=null &&customerCardRecordRecharge.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerCardRecordRecharge.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerCardRecordRecharge.setStationIdList(list);
             customerCardRecordRecharge.setStationId(null);
         }
-        List<CustomerCardRecordRecharge> list =customerCardRecordRechargeService.listQydataCZ(customerCardRecordRecharge);
-        return getTable(list);
+        List<CustomerCardRecordRecharge> rechargelist =customerCardRecordRechargeService.listQydataCZ(customerCardRecordRecharge);
+        return getTable(rechargelist);
     }
-    @PreAuthorize("@ss.hasPermi('customer:recharge:selectCardDetail')")
     @GetMapping("/selectCardDetail")
     public TableDataInfo selectCardDetail(CustomerCardRecordRecharge customerCardRecordRecharge)
     {
-        if(customerCardRecordRecharge!=null &&customerCardRecordRecharge.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerCardRecordRecharge.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
-            customerCardRecordRecharge.setStrSql(StringUtils.join(list, ","));
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerCardRecordRecharge.setStationIdList(list);
             customerCardRecordRecharge.setStationId(null);
         }
@@ -178,14 +175,14 @@ public class CustomerCardRecordRechargeController extends BaseController
         return rspData;
     }
 
-    @PreAuthorize("@ss.hasPermi('customer:recharge:listCZData')")
     @GetMapping(value = "/listCZData")
     public AjaxResult listCZData(CustomerCardRecordRecharge customerCardRecordRecharge)
     {
-        if(customerCardRecordRecharge!=null &&customerCardRecordRecharge.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerCardRecordRecharge.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerCardRecordRecharge.setStationIdList(list);
             customerCardRecordRecharge.setStationId(null);
         }

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerCardSettingController.java

@@ -3,6 +3,8 @@ package com.yijia.customer.controller;
 import java.util.List;
 
 import com.yijia.common.core.domain.entity.SysDept;
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
 import com.yijia.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +43,6 @@ public class CustomerCardSettingController extends BaseController
     /**
      * 查询客户电子会员卡充值优惠设置列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:cardsetting:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerCardSetting customerCardSetting)
     {
@@ -53,7 +54,6 @@ public class CustomerCardSettingController extends BaseController
     /**
      * 导出客户电子会员卡充值优惠设置列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:cardsetting:export')")
     @Log(title = "客户电子会员卡充值优惠设置", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CustomerCardSetting customerCardSetting)
@@ -66,7 +66,6 @@ public class CustomerCardSettingController extends BaseController
     /**
      * 获取客户电子会员卡充值优惠设置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('customer:cardsetting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -76,7 +75,6 @@ public class CustomerCardSettingController extends BaseController
     /**
      * 新增客户电子会员卡充值优惠设置
      */
-    @PreAuthorize("@ss.hasPermi('customer:cardsetting:add')")
     @Log(title = "客户电子会员卡充值优惠设置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CustomerCardSetting customerCardSetting)
@@ -87,7 +85,6 @@ public class CustomerCardSettingController extends BaseController
     /**
      * 修改客户电子会员卡充值优惠设置
      */
-    @PreAuthorize("@ss.hasPermi('customer:cardsetting:edit')")
     @Log(title = "客户电子会员卡充值优惠设置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerCardSetting customerCardSetting)
@@ -98,21 +95,20 @@ public class CustomerCardSettingController extends BaseController
     /**
      * 删除客户电子会员卡充值优惠设置
      */
-    @PreAuthorize("@ss.hasPermi('customer:cardsetting:remove')")
     @Log(title = "客户电子会员卡充值优惠设置", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(customerCardSettingService.deleteCustomerCardSettingByIds(ids));
     }
-    @PreAuthorize("@ss.hasPermi('customer:cardsetting:selectCustomerCardSetting')")
     @GetMapping(value = "/selectCustomerCardSetting")
     public AjaxResult selectCustomerCardSetting(CustomerCardSetting customerCardSetting)
     {
-        if(customerCardSetting!=null &&customerCardSetting.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerCardSetting.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerCardSetting.setStationIdList(list);
             customerCardSetting.setStationId(null);
         }

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerCardSettingDetailController.java

@@ -36,7 +36,6 @@ public class CustomerCardSettingDetailController extends BaseController
     /**
      * 查询客户电子会员卡充值优惠设置明细列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:detail:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerCardSettingDetail customerCardSettingDetail)
     {
@@ -48,7 +47,6 @@ public class CustomerCardSettingDetailController extends BaseController
     /**
      * 查询客户电子会员卡充值优惠设置明细列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:detail:listDetailInfo')")
     @GetMapping("/listDetailInfo")
     public TableDataInfo listDetailInfo(CustomerCardSettingDetail customerCardSettingDetail)
     {
@@ -60,7 +58,6 @@ public class CustomerCardSettingDetailController extends BaseController
     /**
      * 导出客户电子会员卡充值优惠设置明细列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:detail:export')")
     @Log(title = "客户电子会员卡充值优惠设置明细", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CustomerCardSettingDetail customerCardSettingDetail)
@@ -73,7 +70,6 @@ public class CustomerCardSettingDetailController extends BaseController
     /**
      * 获取客户电子会员卡充值优惠设置明细详细信息
      */
-    @PreAuthorize("@ss.hasPermi('customer:detail:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -83,7 +79,6 @@ public class CustomerCardSettingDetailController extends BaseController
     /**
      * 新增客户电子会员卡充值优惠设置明细
      */
-    @PreAuthorize("@ss.hasPermi('customer:detail:add')")
     @Log(title = "客户电子会员卡充值优惠设置明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CustomerCardSettingDetail customerCardSettingDetail)
@@ -94,7 +89,6 @@ public class CustomerCardSettingDetailController extends BaseController
     /**
      * 修改客户电子会员卡充值优惠设置明细
      */
-    @PreAuthorize("@ss.hasPermi('customer:detail:edit')")
     @Log(title = "客户电子会员卡充值优惠设置明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerCardSettingDetail customerCardSettingDetail)
@@ -105,7 +99,6 @@ public class CustomerCardSettingDetailController extends BaseController
     /**
      * 删除客户电子会员卡充值优惠设置明细
      */
-    @PreAuthorize("@ss.hasPermi('customer:detail:remove')")
     @Log(title = "客户电子会员卡充值优惠设置明细", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerElectronicCardController.java

@@ -1,15 +1,11 @@
 package com.yijia.customer.controller;
 
-import java.util.ArrayList;
 import java.util.List;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.yijia.common.constant.HttpStatus;
 import com.yijia.common.core.domain.entity.SysDept;
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
 import com.yijia.system.service.ISysDeptService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -46,26 +42,25 @@ public class CustomerElectronicCardController extends BaseController
     /**
      * 查询客户电子会员卡（储蓄卡）列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:card:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerElectronicCard customerElectronicCard)
     {
-        if(customerElectronicCard!=null &&customerElectronicCard.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerElectronicCard.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerElectronicCard.setStationIdList(list);
             customerElectronicCard.setStationId(null);
         }
         startPage();
-        List<CustomerElectronicCard> list = customerElectronicCardService.selectCustomerElectronicCardList(customerElectronicCard);
-        return getDataTable(list);
+        List<CustomerElectronicCard> cardList = customerElectronicCardService.selectCustomerElectronicCardList(customerElectronicCard);
+        return getDataTable(cardList);
     }
 
     /**
      * 导出客户电子会员卡（储蓄卡）列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:card:export')")
     @Log(title = "客户电子会员卡（储蓄卡）", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CustomerElectronicCard customerElectronicCard)
@@ -78,7 +73,6 @@ public class CustomerElectronicCardController extends BaseController
     /**
      * 获取客户电子会员卡（储蓄卡）详细信息
      */
-    @PreAuthorize("@ss.hasPermi('customer:card:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -88,7 +82,6 @@ public class CustomerElectronicCardController extends BaseController
     /**
      * 新增客户电子会员卡（储蓄卡）
      */
-    @PreAuthorize("@ss.hasPermi('customer:card:add')")
     @Log(title = "客户电子会员卡（储蓄卡）", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CustomerElectronicCard customerElectronicCard)
@@ -99,7 +92,6 @@ public class CustomerElectronicCardController extends BaseController
     /**
      * 修改客户电子会员卡（储蓄卡）
      */
-    @PreAuthorize("@ss.hasPermi('customer:card:edit')")
     @Log(title = "客户电子会员卡（储蓄卡）", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerElectronicCard customerElectronicCard)
@@ -110,7 +102,6 @@ public class CustomerElectronicCardController extends BaseController
     /**
      * 删除客户电子会员卡（储蓄卡）
      */
-    @PreAuthorize("@ss.hasPermi('customer:card:remove')")
     @Log(title = "客户电子会员卡（储蓄卡）", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -120,30 +111,28 @@ public class CustomerElectronicCardController extends BaseController
     /**
      * 查询电子会员数据
      */
-    @PreAuthorize("@ss.hasPermi('customer:card:listSum')")
     @GetMapping("/listSum")
     public AjaxResult listSum(CustomerElectronicCard customerElectronicCard)
     {
-        if(customerElectronicCard!=null &&customerElectronicCard.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerElectronicCard.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerElectronicCard.setStationIdList(list);
             customerElectronicCard.setStationId(null);
         }
         return AjaxResult.success(customerElectronicCardService.listSum(customerElectronicCard));
     }
-
-    @PreAuthorize("@ss.hasPermi('customer:card:selectCard')")
     @GetMapping("/selectCard")
     public TableDataInfo selectCard(CustomerElectronicCard customerElectronicCard)
     {
-        if(customerElectronicCard!=null &&customerElectronicCard.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerElectronicCard.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerElectronicCard.setStationIdList(list);
-            customerElectronicCard.setStrSql(StringUtils.join(list, ","));
             customerElectronicCard.setStationId(null);
         }
        // startPage();
@@ -162,14 +151,14 @@ public class CustomerElectronicCardController extends BaseController
     /**
      * 查询电子会员数据
      */
-    @PreAuthorize("@ss.hasPermi('customer:card:listHYData')")
     @GetMapping("/listHYData")
     public AjaxResult listHYData(CustomerElectronicCard customerElectronicCard)
     {
-        if(customerElectronicCard!=null &&customerElectronicCard.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerElectronicCard.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerElectronicCard.setStationIdList(list);
             customerElectronicCard.setStationId(null);
         }
@@ -179,14 +168,14 @@ public class CustomerElectronicCardController extends BaseController
     /**
      * 查询电子会员数据
      */
-    @PreAuthorize("@ss.hasPermi('customer:card:listJRHYData')")
     @GetMapping("/listJRHYData")
     public AjaxResult listJRHYData(CustomerElectronicCard customerElectronicCard)
     {
-        if(customerElectronicCard!=null &&customerElectronicCard.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(Long.valueOf(customerElectronicCard.getStationId()));
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerElectronicCard.setStationIdList(list);
             customerElectronicCard.setStationId(null);
         }

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

@@ -1,6 +1,8 @@
 package com.yijia.customer.controller;
 import java.util.List;
 import com.yijia.common.core.domain.entity.SysDept;
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
 import com.yijia.system.service.ISysDeptService;
 
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -44,16 +46,17 @@ public class CustomerGradeSettingController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CustomerGradeSetting customerGradeSetting)
     {
-        if(customerGradeSetting!=null &&customerGradeSetting.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(customerGradeSetting.getStationId());
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerGradeSetting.setStationIdList(list);
             customerGradeSetting.setStationId(null);
         }
         startPage();
-        List<CustomerGradeSetting> list = customerGradeSettingService.selectCustomerGradeSettingList(customerGradeSetting);
-        return getDataTable(list);
+        List<CustomerGradeSetting> settingList = customerGradeSettingService.selectCustomerGradeSettingList(customerGradeSetting);
+        return getDataTable(settingList);
     }
 
     /**
@@ -64,16 +67,17 @@ public class CustomerGradeSettingController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CustomerGradeSetting customerGradeSetting)
     {
-        if(customerGradeSetting!=null &&customerGradeSetting.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(customerGradeSetting.getStationId());
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerGradeSetting.setStationIdList(list);
             customerGradeSetting.setStationId(null);
         }
-        List<CustomerGradeSetting> list = customerGradeSettingService.selectCustomerGradeSettingList(customerGradeSetting);
+        List<CustomerGradeSetting> settingList = customerGradeSettingService.selectCustomerGradeSettingList(customerGradeSetting);
         ExcelUtil<CustomerGradeSetting> util = new ExcelUtil<CustomerGradeSetting>(CustomerGradeSetting.class);
-        return util.exportExcel(list, "setting");
+        return util.exportExcel(settingList, "setting");
     }
 
     /**

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

@@ -1,5 +1,7 @@
 package com.yijia.customer.controller;
 import com.yijia.common.core.domain.entity.SysDept;
+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;
@@ -40,46 +42,45 @@ public class CustomerManageController extends BaseController
     /**
      * 查询客户管理列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:manage:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerManage customerManage)
     {
-        if(customerManage!=null &&customerManage.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(customerManage.getStationId());
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerManage.setStationIdList(list);
             customerManage.setStationId(null);
         }
         startPage();
-        List<CustomerManage> list = customerManageService.selectCustomerManage(customerManage);
-        return getDataTable(list);
+        List<CustomerManage> customerManageList = customerManageService.selectCustomerManage(customerManage);
+        return getDataTable(customerManageList);
     }
 
     /**
      * 导出客户管理列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:manage:export')")
     @Log(title = "客户管理", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CustomerManage customerManage)
     {
-        if(customerManage!=null &&customerManage.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(customerManage.getStationId());
-            List<String> list = deptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             customerManage.setStationIdList(list);
             customerManage.setStationId(null);
         }
-        List<CustomerManage> list = customerManageService.selectCustomerManageList(customerManage);
+        List<CustomerManage> customerManageList = customerManageService.selectCustomerManageList(customerManage);
         ExcelUtil<CustomerManage> util = new ExcelUtil<CustomerManage>(CustomerManage.class);
-        return util.exportExcel(list, "manage");
+        return util.exportExcel(customerManageList, "manage");
     }
 
     /**
      * 获取客户管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('customer:manage:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -89,7 +90,6 @@ public class CustomerManageController extends BaseController
     /**
      * 新增客户管理
      */
-    @PreAuthorize("@ss.hasPermi('customer:manage:add')")
     @Log(title = "客户管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CustomerManage customerManage)
@@ -100,7 +100,6 @@ public class CustomerManageController extends BaseController
     /**
      * 修改客户管理
      */
-    @PreAuthorize("@ss.hasPermi('customer:manage:edit')")
     @Log(title = "客户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerManage customerManage)
@@ -111,7 +110,6 @@ public class CustomerManageController extends BaseController
     /**
      * 删除客户管理
      */
-    @PreAuthorize("@ss.hasPermi('customer:manage:remove')")
     @Log(title = "客户管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

yijia-customer/src/main/java/com/yijia/customer/domain/CustomerCardRecordConsumption.java

@@ -11,7 +11,7 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 客户电子会员卡消费记录对象 customer_card_record_consumption
- * 
+ *
  * @author yijia
  * @date 2021-04-13
  */
@@ -27,7 +27,6 @@ public class CustomerCardRecordConsumption extends BaseEntity
     private String orderNo;
 
     /** 微信用户唯一标识 */
-    @Excel(name = "微信用户唯一标识")
     private String unionId;
 
     /** 会员号ID */
@@ -39,15 +38,12 @@ public class CustomerCardRecordConsumption extends BaseEntity
     private String customerName;
 
     /** 电子会员卡消费充值类型：+，充值；-，消费； */
-    @Excel(name = "电子会员卡消费充值类型：+，充值；-，消费；")
     private String usageType;
 
     /** 电子会员卡充值消费类型：1.微信；2.POS机 */
-    @Excel(name = "电子会员卡充值消费类型：1.微信；2.POS机")
     private String payType;
 
     /** 油类：2.柴油；1.汽油； */
-    @Excel(name = "油类：2.柴油；1.汽油；")
     private String cardOilsType;
 
     /** 消费金额 */
@@ -59,11 +55,9 @@ public class CustomerCardRecordConsumption extends BaseEntity
     private BigDecimal balance;
 
     /** 油站ID */
-    @Excel(name = "油站ID")
     private Integer stationId;
 
     /** 油站名称 */
-    @Excel(name = "油站名称")
     private String stationName;
 
     /** 是否消费成功：0，未成功；1，成功 */
@@ -92,106 +86,106 @@ public class CustomerCardRecordConsumption extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setOrderNo(String orderNo) 
+    public void setOrderNo(String orderNo)
     {
         this.orderNo = orderNo;
     }
 
-    public String getOrderNo() 
+    public String getOrderNo()
     {
         return orderNo;
     }
-    public void setUnionId(String unionId) 
+    public void setUnionId(String unionId)
     {
         this.unionId = unionId;
     }
 
-    public String getUnionId() 
+    public String getUnionId()
     {
         return unionId;
     }
-    public void setCustomerNo(String customerNo) 
+    public void setCustomerNo(String customerNo)
     {
         this.customerNo = customerNo;
     }
 
-    public String getCustomerNo() 
+    public String getCustomerNo()
     {
         return customerNo;
     }
-    public void setCustomerName(String customerName) 
+    public void setCustomerName(String customerName)
     {
         this.customerName = customerName;
     }
 
-    public String getCustomerName() 
+    public String getCustomerName()
     {
         return customerName;
     }
-    public void setUsageType(String usageType) 
+    public void setUsageType(String usageType)
     {
         this.usageType = usageType;
     }
 
-    public String getUsageType() 
+    public String getUsageType()
     {
         return usageType;
     }
-    public void setPayType(String payType) 
+    public void setPayType(String payType)
     {
         this.payType = payType;
     }
 
-    public String getPayType() 
+    public String getPayType()
     {
         return payType;
     }
-    public void setCardOilsType(String cardOilsType) 
+    public void setCardOilsType(String cardOilsType)
     {
         this.cardOilsType = cardOilsType;
     }
 
-    public String getCardOilsType() 
+    public String getCardOilsType()
     {
         return cardOilsType;
     }
-    public void setAmt(BigDecimal amt) 
+    public void setAmt(BigDecimal amt)
     {
         this.amt = amt;
     }
 
-    public BigDecimal getAmt() 
+    public BigDecimal getAmt()
     {
         return amt;
     }
-    public void setStationId(Integer stationId) 
+    public void setStationId(Integer stationId)
     {
         this.stationId = stationId;
     }
 
-    public Integer getStationId() 
+    public Integer getStationId()
     {
         return stationId;
     }
-    public void setStationName(String stationName) 
+    public void setStationName(String stationName)
     {
         this.stationName = stationName;
     }
 
-    public String getStationName() 
+    public String getStationName()
     {
         return stationName;
     }
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }
@@ -199,19 +193,19 @@ public class CustomerCardRecordConsumption extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("orderNo", getOrderNo())
-            .append("unionId", getUnionId())
-            .append("customerNo", getCustomerNo())
-            .append("customerName", getCustomerName())
-            .append("usageType", getUsageType())
-            .append("payType", getPayType())
-            .append("cardOilsType", getCardOilsType())
-            .append("amt", getAmt())
-            .append("createTime", getCreateTime())
-            .append("stationId", getStationId())
-            .append("stationName", getStationName())
-            .append("status", getStatus())
-            .toString();
+                .append("id", getId())
+                .append("orderNo", getOrderNo())
+                .append("unionId", getUnionId())
+                .append("customerNo", getCustomerNo())
+                .append("customerName", getCustomerName())
+                .append("usageType", getUsageType())
+                .append("payType", getPayType())
+                .append("cardOilsType", getCardOilsType())
+                .append("amt", getAmt())
+                .append("createTime", getCreateTime())
+                .append("stationId", getStationId())
+                .append("stationName", getStationName())
+                .append("status", getStatus())
+                .toString();
     }
 }

yijia-customer/src/main/java/com/yijia/customer/domain/CustomerCardRecordRecharge.java

@@ -8,7 +8,7 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 客户电子会员卡充值记录对象 customer_card_record_recharge
- * 
+ *
  * @author yijia
  * @date 2021-04-13
  */
@@ -24,7 +24,6 @@ public class CustomerCardRecordRecharge extends BaseEntity
     private String orderNo;
 
     /** 微信用户唯一标识 */
-    @Excel(name = "微信用户唯一标识")
     private String unionId;
 
     /** 会员号ID */
@@ -36,15 +35,13 @@ public class CustomerCardRecordRecharge extends BaseEntity
     private String customerName;
 
     /** 电子会员卡消费充值类型：+，充值；-，消费； */
-    @Excel(name = "电子会员卡消费充值类型：+，充值；-，消费；")
     private String usageType;
 
     /** 电子会员卡充值消费类型：1.微信；2.POS机 */
-    @Excel(name = "电子会员卡充值消费类型：1.微信；2.POS机")
+
     private String payType;
 
     /** 油类：2.柴油；1.汽油； */
-    @Excel(name = "油类：2.柴油；1.汽油；")
     private String cardOilsType;
 
     /** 充值金额 */
@@ -60,15 +57,12 @@ public class CustomerCardRecordRecharge extends BaseEntity
     private BigDecimal balance;
 
     /** 油站ID */
-    @Excel(name = "油站ID")
     private Integer stationId;
 
     /** 油站名称 */
-    @Excel(name = "油站名称")
     private String stationName;
 
     /** 是否充值成功：0，未成功；1，成功 */
-    @Excel(name = "是否充值成功：0，未成功；1，成功")
     private String status;
 
     private String  createDate;
@@ -114,124 +108,124 @@ public class CustomerCardRecordRecharge extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setOrderNo(String orderNo) 
+    public void setOrderNo(String orderNo)
     {
         this.orderNo = orderNo;
     }
 
-    public String getOrderNo() 
+    public String getOrderNo()
     {
         return orderNo;
     }
-    public void setUnionId(String unionId) 
+    public void setUnionId(String unionId)
     {
         this.unionId = unionId;
     }
 
-    public String getUnionId() 
+    public String getUnionId()
     {
         return unionId;
     }
-    public void setCustomerNo(String customerNo) 
+    public void setCustomerNo(String customerNo)
     {
         this.customerNo = customerNo;
     }
 
-    public String getCustomerNo() 
+    public String getCustomerNo()
     {
         return customerNo;
     }
-    public void setCustomerName(String customerName) 
+    public void setCustomerName(String customerName)
     {
         this.customerName = customerName;
     }
 
-    public String getCustomerName() 
+    public String getCustomerName()
     {
         return customerName;
     }
-    public void setUsageType(String usageType) 
+    public void setUsageType(String usageType)
     {
         this.usageType = usageType;
     }
 
-    public String getUsageType() 
+    public String getUsageType()
     {
         return usageType;
     }
-    public void setPayType(String payType) 
+    public void setPayType(String payType)
     {
         this.payType = payType;
     }
 
-    public String getPayType() 
+    public String getPayType()
     {
         return payType;
     }
-    public void setCardOilsType(String cardOilsType) 
+    public void setCardOilsType(String cardOilsType)
     {
         this.cardOilsType = cardOilsType;
     }
 
-    public String getCardOilsType() 
+    public String getCardOilsType()
     {
         return cardOilsType;
     }
-    public void setAmt(BigDecimal amt) 
+    public void setAmt(BigDecimal amt)
     {
         this.amt = amt;
     }
 
-    public BigDecimal getAmt() 
+    public BigDecimal getAmt()
     {
         return amt;
     }
-    public void setPresentAmt(BigDecimal presentAmt) 
+    public void setPresentAmt(BigDecimal presentAmt)
     {
         this.presentAmt = presentAmt;
     }
 
-    public BigDecimal getPresentAmt() 
+    public BigDecimal getPresentAmt()
     {
         return presentAmt;
     }
-    public void setBalance(BigDecimal balance) 
+    public void setBalance(BigDecimal balance)
     {
         this.balance = balance;
     }
 
-    public BigDecimal getBalance() 
+    public BigDecimal getBalance()
     {
         return balance;
     }
-    public void setStationId(Integer stationId) 
+    public void setStationId(Integer stationId)
     {
         this.stationId = stationId;
     }
 
-    public Integer getStationId() 
+    public Integer getStationId()
     {
         return stationId;
     }
-    public void setStationName(String stationName) 
+    public void setStationName(String stationName)
     {
         this.stationName = stationName;
     }
 
-    public String getStationName() 
+    public String getStationName()
     {
         return stationName;
     }
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }
@@ -239,21 +233,21 @@ public class CustomerCardRecordRecharge extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("orderNo", getOrderNo())
-            .append("unionId", getUnionId())
-            .append("customerNo", getCustomerNo())
-            .append("customerName", getCustomerName())
-            .append("usageType", getUsageType())
-            .append("payType", getPayType())
-            .append("cardOilsType", getCardOilsType())
-            .append("amt", getAmt())
-            .append("presentAmt", getPresentAmt())
-            .append("balance", getBalance())
-            .append("createTime", getCreateTime())
-            .append("stationId", getStationId())
-            .append("stationName", getStationName())
-            .append("status", getStatus())
-            .toString();
+                .append("id", getId())
+                .append("orderNo", getOrderNo())
+                .append("unionId", getUnionId())
+                .append("customerNo", getCustomerNo())
+                .append("customerName", getCustomerName())
+                .append("usageType", getUsageType())
+                .append("payType", getPayType())
+                .append("cardOilsType", getCardOilsType())
+                .append("amt", getAmt())
+                .append("presentAmt", getPresentAmt())
+                .append("balance", getBalance())
+                .append("createTime", getCreateTime())
+                .append("stationId", getStationId())
+                .append("stationName", getStationName())
+                .append("status", getStatus())
+                .toString();
     }
 }