优化积分管理，获取当前登录人的油站信息

yijia-integral/src/main/java/com/yijia/integral/controller/CustomerPointsController.java

@@ -3,6 +3,8 @@ package com.yijia.integral.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;
@@ -40,46 +42,45 @@ public class CustomerPointsController extends BaseController
     /**
      * 查询用户积分列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:points:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerPoints customerPoints)
     {
-        if(customerPoints!=null &&customerPoints.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(customerPoints.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){
             customerPoints.setStationIdList(list);
             customerPoints.setStationId(null);
         }
         startPage();
-        List<CustomerPoints> list = customerPointsService.selectCustomerPointsList(customerPoints);
-        return getDataTable(list);
+        List<CustomerPoints> customerPointsList = customerPointsService.selectCustomerPointsList(customerPoints);
+        return getDataTable(customerPointsList);
     }
 
     /**
      * 导出用户积分列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:points:export')")
     @Log(title = "用户积分", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CustomerPoints customerPoints)
     {
-        if(customerPoints!=null &&customerPoints.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(customerPoints.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){
             customerPoints.setStationIdList(list);
             customerPoints.setStationId(null);
         }
-        List<CustomerPoints> list = customerPointsService.selectCustomerPointsList(customerPoints);
+        List<CustomerPoints> customerPointsList = customerPointsService.selectCustomerPointsList(customerPoints);
         ExcelUtil<CustomerPoints> util = new ExcelUtil<CustomerPoints>(CustomerPoints.class);
-        return util.exportExcel(list, "points");
+        return util.exportExcel(customerPointsList, "points");
     }
 
     /**
      * 获取用户积分详细信息
      */
-    @PreAuthorize("@ss.hasPermi('integral:points:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -89,7 +90,6 @@ public class CustomerPointsController extends BaseController
     /**
      * 新增用户积分
      */
-    @PreAuthorize("@ss.hasPermi('integral:points:add')")
     @Log(title = "用户积分", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CustomerPoints customerPoints)
@@ -100,7 +100,6 @@ public class CustomerPointsController extends BaseController
     /**
      * 修改用户积分
      */
-    @PreAuthorize("@ss.hasPermi('integral:points:edit')")
     @Log(title = "用户积分", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerPoints customerPoints)
@@ -111,7 +110,6 @@ public class CustomerPointsController extends BaseController
     /**
      * 删除用户积分
      */
-    @PreAuthorize("@ss.hasPermi('integral:points:remove')")
     @Log(title = "用户积分", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

yijia-integral/src/main/java/com/yijia/integral/controller/CustomerPointsRecordController.java

@@ -3,6 +3,8 @@ package com.yijia.integral.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;
@@ -40,39 +42,45 @@ public class CustomerPointsRecordController extends BaseController
     /**
      * 查询客户积分记录列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:record:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerPointsRecord customerPointsRecord)
     {
-        if(customerPointsRecord!=null &&customerPointsRecord.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(customerPointsRecord.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){
             customerPointsRecord.setStationIdList(list);
             customerPointsRecord.setStationId(null);
         }
         startPage();
-        List<CustomerPointsRecord> list = customerPointsRecordService.selectCustomerPointsRecordList(customerPointsRecord);
-        return getDataTable(list);
+        List<CustomerPointsRecord> recordList = customerPointsRecordService.selectCustomerPointsRecordList(customerPointsRecord);
+        return getDataTable(recordList);
     }
 
     /**
      * 导出客户积分记录列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:record:export')")
     @Log(title = "客户积分记录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CustomerPointsRecord customerPointsRecord)
     {
-        List<CustomerPointsRecord> list = customerPointsRecordService.selectCustomerPointsRecordList(customerPointsRecord);
+        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){
+            customerPointsRecord.setStationIdList(list);
+            customerPointsRecord.setStationId(null);
+        }
+        List<CustomerPointsRecord> recordList = customerPointsRecordService.selectCustomerPointsRecordList(customerPointsRecord);
         ExcelUtil<CustomerPointsRecord> util = new ExcelUtil<CustomerPointsRecord>(CustomerPointsRecord.class);
-        return util.exportExcel(list, "record");
+        return util.exportExcel(recordList, "record");
     }
 
     /**
      * 获取客户积分记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('integral:record:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -82,7 +90,6 @@ public class CustomerPointsRecordController extends BaseController
     /**
      * 新增客户积分记录
      */
-    @PreAuthorize("@ss.hasPermi('integral:record:add')")
     @Log(title = "客户积分记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CustomerPointsRecord customerPointsRecord)
@@ -93,7 +100,6 @@ public class CustomerPointsRecordController extends BaseController
     /**
      * 修改客户积分记录
      */
-    @PreAuthorize("@ss.hasPermi('integral:record:edit')")
     @Log(title = "客户积分记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerPointsRecord customerPointsRecord)
@@ -104,7 +110,6 @@ public class CustomerPointsRecordController extends BaseController
     /**
      * 删除客户积分记录
      */
-    @PreAuthorize("@ss.hasPermi('integral:record:remove')")
     @Log(title = "客户积分记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

yijia-integral/src/main/java/com/yijia/integral/controller/IntegralOrderController.java

@@ -3,6 +3,8 @@ package com.yijia.integral.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;
@@ -40,46 +42,45 @@ public class IntegralOrderController extends BaseController
     /**
      * 查询积分消费订单列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:order:list')")
     @GetMapping("/list")
     public TableDataInfo list(IntegralOrder integralOrder)
     {
-        if(integralOrder!=null &&integralOrder.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(integralOrder.getStationId());
-            List<String> list = sysDeptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             integralOrder.setStationIdList(list);
             integralOrder.setStationId(null);
         }
         startPage();
-        List<IntegralOrder> list = integralOrderService.selectIntegralOrderList(integralOrder);
-        return getDataTable(list);
+        List<IntegralOrder> orderList = integralOrderService.selectIntegralOrderList(integralOrder);
+        return getDataTable(orderList);
     }
 
     /**
      * 导出积分消费订单列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:order:export')")
     @Log(title = "积分消费订单", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(IntegralOrder integralOrder)
     {
-        if(integralOrder!=null &&integralOrder.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(integralOrder.getStationId());
-            List<String> list = sysDeptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             integralOrder.setStationIdList(list);
             integralOrder.setStationId(null);
         }
-        List<IntegralOrder> list = integralOrderService.selectIntegralOrderList(integralOrder);
+        List<IntegralOrder> orderList = integralOrderService.selectIntegralOrderList(integralOrder);
         ExcelUtil<IntegralOrder> util = new ExcelUtil<IntegralOrder>(IntegralOrder.class);
-        return util.exportExcel(list, "order");
+        return util.exportExcel(orderList, "order");
     }
 
     /**
      * 获取积分消费订单详细信息
      */
-    @PreAuthorize("@ss.hasPermi('integral:order:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -89,7 +90,6 @@ public class IntegralOrderController extends BaseController
     /**
      * 新增积分消费订单
      */
-    @PreAuthorize("@ss.hasPermi('integral:order:add')")
     @Log(title = "积分消费订单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody IntegralOrder integralOrder)
@@ -100,7 +100,6 @@ public class IntegralOrderController extends BaseController
     /**
      * 修改积分消费订单
      */
-    @PreAuthorize("@ss.hasPermi('integral:order:edit')")
     @Log(title = "积分消费订单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody IntegralOrder integralOrder)
@@ -111,7 +110,6 @@ public class IntegralOrderController extends BaseController
     /**
      * 删除积分消费订单
      */
-    @PreAuthorize("@ss.hasPermi('integral:order:remove')")
     @Log(title = "积分消费订单", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

yijia-integral/src/main/java/com/yijia/integral/controller/IntegralRuleController.java

@@ -3,6 +3,8 @@ package com.yijia.integral.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;
@@ -40,20 +42,20 @@ public class IntegralRuleController extends BaseController
     /**
      * 查询积分规则列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:rule:list')")
     @GetMapping("/list")
     public TableDataInfo list(IntegralRule integralRule)
     {
-        if(integralRule!=null &&integralRule.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(integralRule.getStationId());
-            List<String> list = sysDeptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             integralRule.setStationIdList(list);
             integralRule.setStationId(null);
         }
         startPage();
-        List<IntegralRule> list = integralRuleService.selectIntegralRuleList(integralRule);
-        return getDataTable(list);
+        List<IntegralRule> integralRuleList = integralRuleService.selectIntegralRuleList(integralRule);
+        return getDataTable(integralRuleList);
     }
 
     /**
@@ -61,30 +63,30 @@ public class IntegralRuleController extends BaseController
      * @param integralRule
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('integral:rule:listRuleInfo')")
     @GetMapping("/listRuleInfo")
     public TableDataInfo listRuleInfo(IntegralRule integralRule)
     {
-        if(integralRule!=null &&integralRule.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(integralRule.getStationId());
-            List<String> list = sysDeptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             integralRule.setStationIdList(list);
             integralRule.setStationId(null);
         }
         startPage();
-        List<IntegralRule> list = integralRuleService.listRuleInfo(integralRule);
-        return getDataTable(list);
+        List<IntegralRule> integralRuleList = integralRuleService.listRuleInfo(integralRule);
+        return getDataTable(integralRuleList);
     }
 
-    @PreAuthorize("@ss.hasPermi('integral:rule:listRuleOne')")
     @GetMapping("/listRuleOne")
     public AjaxResult listRuleOne(IntegralRule integralRule)
     {
-        if(integralRule!=null &&integralRule.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(integralRule.getStationId());
-            List<String> list = sysDeptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             integralRule.setStationIdList(list);
             integralRule.setStationId(null);
         }
@@ -94,27 +96,26 @@ public class IntegralRuleController extends BaseController
     /**
      * 导出积分规则列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:rule:export')")
     @Log(title = "积分规则", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(IntegralRule integralRule)
     {
-        if(integralRule!=null &&integralRule.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(integralRule.getStationId());
-            List<String> list = sysDeptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             integralRule.setStationIdList(list);
             integralRule.setStationId(null);
         }
-        List<IntegralRule> list = integralRuleService.selectIntegralRuleList(integralRule);
+        List<IntegralRule> integralRuleList = integralRuleService.selectIntegralRuleList(integralRule);
         ExcelUtil<IntegralRule> util = new ExcelUtil<IntegralRule>(IntegralRule.class);
-        return util.exportExcel(list, "rule");
+        return util.exportExcel(integralRuleList, "rule");
     }
 
     /**
      * 获取积分规则详细信息
      */
-    @PreAuthorize("@ss.hasPermi('integral:rule:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -124,7 +125,6 @@ public class IntegralRuleController extends BaseController
     /**
      * 新增积分规则
      */
-    @PreAuthorize("@ss.hasPermi('integral:rule:add')")
     @Log(title = "积分规则", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody IntegralRule integralRule)
@@ -138,7 +138,6 @@ public class IntegralRuleController extends BaseController
     /**
      * 修改积分规则
      */
-    @PreAuthorize("@ss.hasPermi('integral:rule:edit')")
     @Log(title = "积分规则", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody IntegralRule integralRule)
@@ -152,7 +151,6 @@ public class IntegralRuleController extends BaseController
     /**
      * 删除积分规则
      */
-    @PreAuthorize("@ss.hasPermi('integral:rule:remove')")
     @Log(title = "积分规则", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

yijia-integral/src/main/java/com/yijia/integral/controller/IntegralShopPicController.java

@@ -3,6 +3,8 @@ package com.yijia.integral.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;
@@ -40,20 +42,20 @@ public class IntegralShopPicController extends BaseController
     /**
      * 查询积分商城图片信息列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:pic:list')")
     @GetMapping("/list")
     public TableDataInfo list(IntegralShopPic integralShopPic)
     {
-        if(integralShopPic!=null &&integralShopPic.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(integralShopPic.getStationId());
-            List<String> list = sysDeptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             integralShopPic.setStationIdList(list);
             integralShopPic.setStationId(null);
         }
         startPage();
-        List<IntegralShopPic> list = integralShopPicService.selectIntegralShopPicList(integralShopPic);
-        return getDataTable(list);
+        List<IntegralShopPic> piclist = integralShopPicService.selectIntegralShopPicList(integralShopPic);
+        return getDataTable(piclist);
     }
 
     /**
@@ -64,16 +66,17 @@ public class IntegralShopPicController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(IntegralShopPic integralShopPic)
     {
-        if(integralShopPic!=null &&integralShopPic.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(integralShopPic.getStationId());
-            List<String> list = sysDeptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             integralShopPic.setStationIdList(list);
             integralShopPic.setStationId(null);
         }
-        List<IntegralShopPic> list = integralShopPicService.selectIntegralShopPicList(integralShopPic);
+        List<IntegralShopPic> piclist = integralShopPicService.selectIntegralShopPicList(integralShopPic);
         ExcelUtil<IntegralShopPic> util = new ExcelUtil<IntegralShopPic>(IntegralShopPic.class);
-        return util.exportExcel(list, "pic");
+        return util.exportExcel(piclist, "pic");
     }
 
     /**

yijia-integral/src/main/java/com/yijia/integral/controller/IntegralWaresController.java

@@ -42,46 +42,45 @@ public class IntegralWaresController extends BaseController
     /**
      * 查询【请填写功能名称】列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:wares:list')")
     @GetMapping("/list")
     public TableDataInfo list(IntegralWares integralWares)
     {
-        if(integralWares!=null &&integralWares.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(integralWares.getStationId());
-            List<String> list = sysDeptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             integralWares.setStationIdList(list);
             integralWares.setStationId(null);
         }
         startPage();
-        List<IntegralWares> list = integralWaresService.selectIntegralWaresList(integralWares);
-        return getDataTable(list);
+        List<IntegralWares> waresList = integralWaresService.selectIntegralWaresList(integralWares);
+        return getDataTable(waresList);
     }
 
     /**
      * 导出【请填写功能名称】列表
      */
-    @PreAuthorize("@ss.hasPermi('integral:wares:export')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(IntegralWares integralWares)
     {
-        if(integralWares!=null &&integralWares.getStationId()!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(integralWares.getStationId());
-            List<String> list = sysDeptService.selectDeptId(dept);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
             integralWares.setStationIdList(list);
             integralWares.setStationId(null);
         }
-        List<IntegralWares> list = integralWaresService.selectIntegralWaresList(integralWares);
+        List<IntegralWares> waresList = integralWaresService.selectIntegralWaresList(integralWares);
         ExcelUtil<IntegralWares> util = new ExcelUtil<IntegralWares>(IntegralWares.class);
-        return util.exportExcel(list, "wares");
+        return util.exportExcel(waresList, "wares");
     }
 
     /**
      * 获取【请填写功能名称】详细信息
      */
-    @PreAuthorize("@ss.hasPermi('integral:wares:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -91,7 +90,6 @@ public class IntegralWaresController extends BaseController
     /**
      * 新增【请填写功能名称】
      */
-    @PreAuthorize("@ss.hasPermi('integral:wares:add')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody IntegralWares integralWares)
@@ -106,7 +104,6 @@ public class IntegralWaresController extends BaseController
     /**
      * 修改【请填写功能名称】
      */
-    @PreAuthorize("@ss.hasPermi('integral:wares:edit')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody IntegralWares integralWares)
@@ -120,7 +117,6 @@ public class IntegralWaresController extends BaseController
     /**
      * 删除【请填写功能名称】
      */
-    @PreAuthorize("@ss.hasPermi('integral:wares:remove')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)