后端接口权限设置取消

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetCarController.java

@@ -2,7 +2,9 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.ruoyi.common.utils.SnowFlake;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +39,6 @@ public class CmcBudgetCarController extends BaseController
     /**
      * 查询cmc车辆预算列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcBudgetCar cmcBudgetCar)
     {
@@ -49,7 +50,6 @@ public class CmcBudgetCarController extends BaseController
     /**
      * 导出cmc车辆预算列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:export')")
     @Log(title = "cmc车辆预算", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcBudgetCar cmcBudgetCar)
@@ -62,7 +62,6 @@ public class CmcBudgetCarController extends BaseController
     /**
      * 获取cmc车辆预算详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:query')")
     @GetMapping(value = "/{budgetCarId}")
     public AjaxResult getInfo(@PathVariable("budgetCarId") String budgetCarId)
     {
@@ -72,18 +71,17 @@ public class CmcBudgetCarController extends BaseController
     /**
      * 新增cmc车辆预算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:add')")
     @Log(title = "cmc车辆预算", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcBudgetCar cmcBudgetCar)
     {
+        cmcBudgetCar.setBudgetCarId(new SnowFlake().generateId());
         return toAjax(cmcBudgetCarService.insertCmcBudgetCar(cmcBudgetCar));
     }
 
     /**
      * 修改cmc车辆预算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:edit')")
     @Log(title = "cmc车辆预算", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudgetCar cmcBudgetCar)
@@ -94,7 +92,6 @@ public class CmcBudgetCarController extends BaseController
     /**
      * 删除cmc车辆预算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:remove')")
     @Log(title = "cmc车辆预算", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{budgetCarIds}")
     public AjaxResult remove(@PathVariable String[] budgetCarIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetController.java

@@ -3,8 +3,7 @@ package com.ruoyi.web.controller.oa;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.utils.SnowFlake;
-import org.springframework.security.access.prepost.PreAuthorize;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -32,7 +31,6 @@ public class CmcBudgetController extends BaseController
     /**
      * 查询cmc预算管理列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:budget:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcBudget cmcBudget)
     {
@@ -44,7 +42,6 @@ public class CmcBudgetController extends BaseController
     /**
      * 导出cmc预算管理列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:budget:export')")
     @Log(title = "cmc预算管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcBudget cmcBudget)
@@ -57,7 +54,6 @@ public class CmcBudgetController extends BaseController
     /**
      * 获取cmc预算管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:budget:query')")
     @GetMapping(value = "/{budgetId}")
     public AjaxResult getInfo(@PathVariable("budgetId") String budgetId)
     {
@@ -67,7 +63,6 @@ public class CmcBudgetController extends BaseController
     /**
      * 新增cmc预算管理
      */
-    @PreAuthorize("@ss.hasPermi('oa:budget:add')")
     @Log(title = "cmc预算管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcBudget cmcBudget)
@@ -79,7 +74,6 @@ public class CmcBudgetController extends BaseController
     /**
      * 修改cmc预算管理
      */
-    @PreAuthorize("@ss.hasPermi('oa:budget:edit')")
     @Log(title = "cmc预算管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudget cmcBudget)
@@ -91,7 +85,6 @@ public class CmcBudgetController extends BaseController
     /**
      * 删除cmc预算管理
      */
-    @PreAuthorize("@ss.hasPermi('oa:budget:remove')")
     @Log(title = "cmc预算管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{budgetIds}")
     public AjaxResult remove(@PathVariable String[] budgetIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetDeviceController.java

@@ -2,7 +2,9 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.ruoyi.common.utils.SnowFlake;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +39,6 @@ public class CmcBudgetDeviceController extends BaseController
     /**
      * 查询cmc设备预算列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcBudgetDevice cmcBudgetDevice)
     {
@@ -49,7 +50,6 @@ public class CmcBudgetDeviceController extends BaseController
     /**
      * 导出cmc设备预算列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:export')")
     @Log(title = "cmc设备预算", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcBudgetDevice cmcBudgetDevice)
@@ -62,7 +62,6 @@ public class CmcBudgetDeviceController extends BaseController
     /**
      * 获取cmc设备预算详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:query')")
     @GetMapping(value = "/{budgetDeviceId}")
     public AjaxResult getInfo(@PathVariable("budgetDeviceId") String budgetDeviceId)
     {
@@ -72,18 +71,17 @@ public class CmcBudgetDeviceController extends BaseController
     /**
      * 新增cmc设备预算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:add')")
     @Log(title = "cmc设备预算", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcBudgetDevice cmcBudgetDevice)
     {
+        cmcBudgetDevice.setBudgetDeviceId(new SnowFlake().generateId());
         return toAjax(cmcBudgetDeviceService.insertCmcBudgetDevice(cmcBudgetDevice));
     }
 
     /**
      * 修改cmc设备预算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:edit')")
     @Log(title = "cmc设备预算", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudgetDevice cmcBudgetDevice)
@@ -94,7 +92,6 @@ public class CmcBudgetDeviceController extends BaseController
     /**
      * 删除cmc设备预算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:remove')")
     @Log(title = "cmc设备预算", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{budgetDeviceIds}")
     public AjaxResult remove(@PathVariable String[] budgetDeviceIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetSettleController.java

@@ -2,7 +2,9 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.ruoyi.common.utils.SnowFlake;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +39,6 @@ public class CmcBudgetSettleController extends BaseController
     /**
      * 查询cmc预结算列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcBudgetSettle cmcBudgetSettle)
     {
@@ -49,7 +50,6 @@ public class CmcBudgetSettleController extends BaseController
     /**
      * 导出cmc预结算列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:export')")
     @Log(title = "cmc预结算", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcBudgetSettle cmcBudgetSettle)
@@ -62,7 +62,6 @@ public class CmcBudgetSettleController extends BaseController
     /**
      * 获取cmc预结算详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:query')")
     @GetMapping(value = "/{budgetSettleId}")
     public AjaxResult getInfo(@PathVariable("budgetSettleId") String budgetSettleId)
     {
@@ -72,18 +71,17 @@ public class CmcBudgetSettleController extends BaseController
     /**
      * 新增cmc预结算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:add')")
     @Log(title = "cmc预结算", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcBudgetSettle cmcBudgetSettle)
     {
+        cmcBudgetSettle.setBudgetSettleId(new SnowFlake().generateId());
         return toAjax(cmcBudgetSettleService.insertCmcBudgetSettle(cmcBudgetSettle));
     }
 
     /**
      * 修改cmc预结算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:edit')")
     @Log(title = "cmc预结算", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudgetSettle cmcBudgetSettle)
@@ -94,7 +92,6 @@ public class CmcBudgetSettleController extends BaseController
     /**
      * 删除cmc预结算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:remove')")
     @Log(title = "cmc预结算", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{budgetSettleIds}")
     public AjaxResult remove(@PathVariable String[] budgetSettleIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetStaffController.java

@@ -2,7 +2,9 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.ruoyi.common.utils.SnowFlake;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +39,6 @@ public class CmcBudgetStaffController extends BaseController
     /**
      * 查询cmc人员预算列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcBudgetStaff cmcBudgetStaff)
     {
@@ -49,7 +50,6 @@ public class CmcBudgetStaffController extends BaseController
     /**
      * 导出cmc人员预算列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:export')")
     @Log(title = "cmc人员预算", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcBudgetStaff cmcBudgetStaff)
@@ -62,7 +62,6 @@ public class CmcBudgetStaffController extends BaseController
     /**
      * 获取cmc人员预算详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:query')")
     @GetMapping(value = "/{budgetStaffId}")
     public AjaxResult getInfo(@PathVariable("budgetStaffId") String budgetStaffId)
     {
@@ -72,18 +71,17 @@ public class CmcBudgetStaffController extends BaseController
     /**
      * 新增cmc人员预算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:add')")
     @Log(title = "cmc人员预算", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcBudgetStaff cmcBudgetStaff)
     {
+        cmcBudgetStaff.setBudgetStaffId(new SnowFlake().generateId());
         return toAjax(cmcBudgetStaffService.insertCmcBudgetStaff(cmcBudgetStaff));
     }
 
     /**
      * 修改cmc人员预算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:edit')")
     @Log(title = "cmc人员预算", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudgetStaff cmcBudgetStaff)
@@ -94,7 +92,6 @@ public class CmcBudgetStaffController extends BaseController
     /**
      * 删除cmc人员预算
      */
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:remove')")
     @Log(title = "cmc人员预算", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{budgetStaffIds}")
     public AjaxResult remove(@PathVariable String[] budgetStaffIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarController.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -55,7 +55,6 @@ public class CmcCarController extends BaseController
     /**
      * 导出cmc车辆信息列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:export')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcCar cmcCar)
@@ -68,7 +67,6 @@ public class CmcCarController extends BaseController
     /**
      * 获取cmc车辆信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:query')")
     @GetMapping(value = "/{carId}")
     public AjaxResult getInfo(@PathVariable("carId") Integer carId)
     {
@@ -78,7 +76,6 @@ public class CmcCarController extends BaseController
     /**
      * 新增cmc车辆信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:add')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcCar cmcCar)
@@ -103,7 +100,6 @@ public class CmcCarController extends BaseController
     /**
      * 修改cmc车辆信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:edit')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcCar cmcCar)
@@ -114,7 +110,6 @@ public class CmcCarController extends BaseController
     /**
      * 删除cmc车辆信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:remove')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{carIds}")
     public AjaxResult remove(@PathVariable Long[] carIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarExpenseController.java

@@ -4,7 +4,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.SnowFlake;
-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;
@@ -39,7 +38,6 @@ public class CmcCarExpenseController extends BaseController
     /**
      * 查询cmc车辆费用列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:expense:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcCarExpense cmcCarExpense)
     {
@@ -51,7 +49,6 @@ public class CmcCarExpenseController extends BaseController
     /**
      * 导出cmc车辆费用列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:expense:export')")
     @Log(title = "cmc车辆费用", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcCarExpense cmcCarExpense)
@@ -64,7 +61,6 @@ public class CmcCarExpenseController extends BaseController
     /**
      * 获取cmc车辆费用详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:expense:query')")
     @GetMapping(value = "/{carExpenseId}")
     public AjaxResult getInfo(@PathVariable("carExpenseId") String carExpenseId)
     {
@@ -74,7 +70,6 @@ public class CmcCarExpenseController extends BaseController
     /**
      * 新增cmc车辆费用
      */
-    @PreAuthorize("@ss.hasPermi('oa:expense:add')")
     @Log(title = "cmc车辆费用", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcCarExpense cmcCarExpense)
@@ -86,7 +81,6 @@ public class CmcCarExpenseController extends BaseController
     /**
      * 修改cmc车辆费用
      */
-    @PreAuthorize("@ss.hasPermi('oa:expense:edit')")
     @Log(title = "cmc车辆费用", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcCarExpense cmcCarExpense)
@@ -97,7 +91,6 @@ public class CmcCarExpenseController extends BaseController
     /**
      * 删除cmc车辆费用
      */
-    @PreAuthorize("@ss.hasPermi('oa:expense:remove')")
     @Log(title = "cmc车辆费用", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{carExpenseIds}")
     public AjaxResult remove(@PathVariable String[] carExpenseIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java

@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-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;
@@ -37,7 +36,6 @@ public class CmcContractController extends BaseController
     /**
      * 查询cmc合同评审列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:contract:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcContract cmcContract)
     {
@@ -49,7 +47,6 @@ public class CmcContractController extends BaseController
     /**
      * 导出cmc合同评审列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:contract:export')")
     @Log(title = "cmc合同评审", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcContract cmcContract)
@@ -62,7 +59,6 @@ public class CmcContractController extends BaseController
     /**
      * 获取cmc合同评审详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:contract:query')")
     @GetMapping(value = "/{contractId}")
     public AjaxResult getInfo(@PathVariable("contractId") String contractId)
     {
@@ -72,7 +68,6 @@ public class CmcContractController extends BaseController
     /**
      * 新增cmc合同评审
      */
-    @PreAuthorize("@ss.hasPermi('oa:contract:add')")
     @Log(title = "cmc合同评审", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcContract cmcContract)
@@ -83,7 +78,6 @@ public class CmcContractController extends BaseController
     /**
      * 修改cmc合同评审
      */
-    @PreAuthorize("@ss.hasPermi('oa:contract:edit')")
     @Log(title = "cmc合同评审", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcContract cmcContract)
@@ -94,7 +88,6 @@ public class CmcContractController extends BaseController
     /**
      * 删除cmc合同评审
      */
-    @PreAuthorize("@ss.hasPermi('oa:contract:remove')")
     @Log(title = "cmc合同评审", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{contractIds}")
     public AjaxResult remove(@PathVariable String[] contractIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceController.java

@@ -6,7 +6,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.DateUtils;
-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;

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPostSalaryController.java

@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-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;
@@ -37,7 +36,6 @@ public class CmcPostSalaryController extends BaseController
     /**
      * 查询cmc岗位工资列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:salary:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcPostSalary cmcPostSalary)
     {
@@ -49,7 +47,6 @@ public class CmcPostSalaryController extends BaseController
     /**
      * 导出cmc岗位工资列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:salary:export')")
     @Log(title = "cmc岗位工资", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcPostSalary cmcPostSalary)
@@ -62,7 +59,6 @@ public class CmcPostSalaryController extends BaseController
     /**
      * 获取cmc岗位工资详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:salary:query')")
     @GetMapping(value = "/{salaryId}")
     public AjaxResult getInfo(@PathVariable("salaryId") Integer salaryId)
     {
@@ -72,7 +68,6 @@ public class CmcPostSalaryController extends BaseController
     /**
      * 新增cmc岗位工资
      */
-    @PreAuthorize("@ss.hasPermi('oa:salary:add')")
     @Log(title = "cmc岗位工资", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcPostSalary cmcPostSalary)
@@ -83,7 +78,6 @@ public class CmcPostSalaryController extends BaseController
     /**
      * 修改cmc岗位工资
      */
-    @PreAuthorize("@ss.hasPermi('oa:salary:edit')")
     @Log(title = "cmc岗位工资", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcPostSalary cmcPostSalary)
@@ -94,7 +88,6 @@ public class CmcPostSalaryController extends BaseController
     /**
      * 删除cmc岗位工资
      */
-    @PreAuthorize("@ss.hasPermi('oa:salary:remove')")
     @Log(title = "cmc岗位工资", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{salaryIds}")
     public AjaxResult remove(@PathVariable Integer[] salaryIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPriceController.java

@@ -1,12 +1,10 @@
 package com.ruoyi.web.controller.oa;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
 import com.alibaba.fastjson2.JSONObject;
 import org.apache.ibatis.annotations.Param;
-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;
@@ -43,7 +41,6 @@ public class CmcPriceController extends BaseController
     /**
      * 查询单价表列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:price:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcPrice cmcPrice)
     {
@@ -55,7 +52,6 @@ public class CmcPriceController extends BaseController
     /**
      * 导出单价表列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:price:export')")
     @Log(title = "单价表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcPrice cmcPrice)
@@ -68,7 +64,6 @@ public class CmcPriceController extends BaseController
     /**
      * 获取单价表详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:price:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -147,7 +142,6 @@ public class CmcPriceController extends BaseController
     /**
      * 新增单价表
      */
-    @PreAuthorize("@ss.hasPermi('oa:price:add')")
     @Log(title = "单价表", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcPrice cmcPrice)
@@ -158,7 +152,6 @@ public class CmcPriceController extends BaseController
     /**
      * 修改单价表
      */
-    @PreAuthorize("@ss.hasPermi('oa:price:edit')")
     @Log(title = "单价表", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcPrice cmcPrice)
@@ -169,7 +162,6 @@ public class CmcPriceController extends BaseController
     /**
      * 删除单价表
      */
-    @PreAuthorize("@ss.hasPermi('oa:price:remove')")
     @Log(title = "单价表", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectCommentController.java

@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-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;
@@ -37,7 +36,6 @@ public class CmcProjectCommentController extends BaseController
     /**
      * 查询cmc项目审批列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcProjectComment cmcProjectComment)
     {
@@ -49,7 +47,6 @@ public class CmcProjectCommentController extends BaseController
     /**
      * 导出cmc项目审批列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:export')")
     @Log(title = "cmc项目审批", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcProjectComment cmcProjectComment)
@@ -62,7 +59,6 @@ public class CmcProjectCommentController extends BaseController
     /**
      * 获取cmc项目审批详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:query')")
     @GetMapping(value = "/{projectId}")
     public AjaxResult getInfo(@PathVariable("projectId") String projectId)
     {
@@ -72,7 +68,6 @@ public class CmcProjectCommentController extends BaseController
     /**
      * 新增cmc项目审批
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:add')")
     @Log(title = "cmc项目审批", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcProjectComment cmcProjectComment)
@@ -83,7 +78,6 @@ public class CmcProjectCommentController extends BaseController
     /**
      * 修改cmc项目审批
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:edit')")
     @Log(title = "cmc项目审批", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcProjectComment cmcProjectComment)
@@ -94,7 +88,6 @@ public class CmcProjectCommentController extends BaseController
     /**
      * 删除cmc项目审批
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:remove')")
     @Log(title = "cmc项目审批", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{projectIds}")
     public AjaxResult remove(@PathVariable String[] projectIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectProgressController.java

@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-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;
@@ -37,7 +36,6 @@ public class CmcProjectProgressController extends BaseController
     /**
      * 查询cmc项目进度列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcProjectProgress cmcProjectProgress)
     {
@@ -49,7 +47,6 @@ public class CmcProjectProgressController extends BaseController
     /**
      * 导出cmc项目进度列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:export')")
     @Log(title = "cmc项目进度", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcProjectProgress cmcProjectProgress)
@@ -62,7 +59,6 @@ public class CmcProjectProgressController extends BaseController
     /**
      * 获取cmc项目进度详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:query')")
     @GetMapping(value = "/{progressId}")
     public AjaxResult getInfo(@PathVariable("progressId") String progressId)
     {
@@ -72,7 +68,6 @@ public class CmcProjectProgressController extends BaseController
     /**
      * 新增cmc项目进度
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:add')")
     @Log(title = "cmc项目进度", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
@@ -83,7 +78,6 @@ public class CmcProjectProgressController extends BaseController
     /**
      * 修改cmc项目进度
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:edit')")
     @Log(title = "cmc项目进度", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcProjectProgress cmcProjectProgress)
@@ -94,7 +88,6 @@ public class CmcProjectProgressController extends BaseController
     /**
      * 删除cmc项目进度
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:remove')")
     @Log(title = "cmc项目进度", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{progressIds}")
     public AjaxResult remove(@PathVariable String[] progressIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectWorkerController.java

@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-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;
@@ -37,7 +36,6 @@ public class CmcProjectWorkerController extends BaseController
     /**
      * 查询cmc项目人员列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcProjectWorker cmcProjectWorker)
     {
@@ -49,7 +47,6 @@ public class CmcProjectWorkerController extends BaseController
     /**
      * 导出cmc项目人员列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:export')")
     @Log(title = "cmc项目人员", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcProjectWorker cmcProjectWorker)
@@ -62,7 +59,6 @@ public class CmcProjectWorkerController extends BaseController
     /**
      * 获取cmc项目人员详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -72,7 +68,6 @@ public class CmcProjectWorkerController extends BaseController
     /**
      * 新增cmc项目人员
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:add')")
     @Log(title = "cmc项目人员", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcProjectWorker cmcProjectWorker)
@@ -83,7 +78,6 @@ public class CmcProjectWorkerController extends BaseController
     /**
      * 修改cmc项目人员
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:edit')")
     @Log(title = "cmc项目人员", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcProjectWorker cmcProjectWorker)
@@ -94,7 +88,6 @@ public class CmcProjectWorkerController extends BaseController
     /**
      * 删除cmc项目人员
      */
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:remove')")
     @Log(title = "cmc项目人员", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSafeController.java

@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-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;
@@ -37,7 +36,6 @@ public class CmcSafeController extends BaseController
     /**
      * 查询cmc安全交底列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:safe:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcSafe cmcSafe)
     {
@@ -49,7 +47,6 @@ public class CmcSafeController extends BaseController
     /**
      * 导出cmc安全交底列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:safe:export')")
     @Log(title = "cmc安全交底", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcSafe cmcSafe)
@@ -62,7 +59,6 @@ public class CmcSafeController extends BaseController
     /**
      * 获取cmc安全交底详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:safe:query')")
     @GetMapping(value = "/{safeId}")
     public AjaxResult getInfo(@PathVariable("safeId") String safeId)
     {
@@ -72,7 +68,6 @@ public class CmcSafeController extends BaseController
     /**
      * 新增cmc安全交底
      */
-    @PreAuthorize("@ss.hasPermi('oa:safe:add')")
     @Log(title = "cmc安全交底", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcSafe cmcSafe)
@@ -83,7 +78,6 @@ public class CmcSafeController extends BaseController
     /**
      * 修改cmc安全交底
      */
-    @PreAuthorize("@ss.hasPermi('oa:safe:edit')")
     @Log(title = "cmc安全交底", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcSafe cmcSafe)
@@ -94,7 +88,6 @@ public class CmcSafeController extends BaseController
     /**
      * 删除cmc安全交底
      */
-    @PreAuthorize("@ss.hasPermi('oa:safe:remove')")
     @Log(title = "cmc安全交底", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{safeIds}")
     public AjaxResult remove(@PathVariable String[] safeIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTechnicalController.java

@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-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;
@@ -37,7 +36,6 @@ public class CmcTechnicalController extends BaseController
     /**
      * 查询cmc技术方案列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:technical:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcTechnical cmcTechnical)
     {
@@ -49,7 +47,6 @@ public class CmcTechnicalController extends BaseController
     /**
      * 导出cmc技术方案列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:technical:export')")
     @Log(title = "cmc技术方案", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcTechnical cmcTechnical)
@@ -62,7 +59,6 @@ public class CmcTechnicalController extends BaseController
     /**
      * 获取cmc技术方案详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:technical:query')")
     @GetMapping(value = "/{technicalId}")
     public AjaxResult getInfo(@PathVariable("technicalId") String technicalId)
     {
@@ -72,7 +68,6 @@ public class CmcTechnicalController extends BaseController
     /**
      * 新增cmc技术方案
      */
-    @PreAuthorize("@ss.hasPermi('oa:technical:add')")
     @Log(title = "cmc技术方案", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcTechnical cmcTechnical)
@@ -83,7 +78,6 @@ public class CmcTechnicalController extends BaseController
     /**
      * 修改cmc技术方案
      */
-    @PreAuthorize("@ss.hasPermi('oa:technical:edit')")
     @Log(title = "cmc技术方案", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcTechnical cmcTechnical)
@@ -94,7 +88,6 @@ public class CmcTechnicalController extends BaseController
     /**
      * 删除cmc技术方案
      */
-    @PreAuthorize("@ss.hasPermi('oa:technical:remove')")
     @Log(title = "cmc技术方案", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{technicalIds}")
     public AjaxResult remove(@PathVariable String[] technicalIds)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTenderController.java

@@ -1,8 +1,7 @@
-package com.ruoyi.oa.controller;
+package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-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;
@@ -37,7 +36,6 @@ public class CmcTenderController extends BaseController
     /**
      * 查询投标管理列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:tender:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcTender cmcTender)
     {
@@ -49,7 +47,6 @@ public class CmcTenderController extends BaseController
     /**
      * 导出投标管理列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:tender:export')")
     @Log(title = "投标管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcTender cmcTender)
@@ -62,7 +59,6 @@ public class CmcTenderController extends BaseController
     /**
      * 获取投标管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:tender:query')")
     @GetMapping(value = "/{tenderId}")
     public AjaxResult getInfo(@PathVariable("tenderId") String tenderId)
     {
@@ -72,7 +68,6 @@ public class CmcTenderController extends BaseController
     /**
      * 新增投标管理
      */
-    @PreAuthorize("@ss.hasPermi('oa:tender:add')")
     @Log(title = "投标管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcTender cmcTender)
@@ -83,7 +78,6 @@ public class CmcTenderController extends BaseController
     /**
      * 修改投标管理
      */
-    @PreAuthorize("@ss.hasPermi('oa:tender:edit')")
     @Log(title = "投标管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcTender cmcTender)
@@ -94,7 +88,6 @@ public class CmcTenderController extends BaseController
     /**
      * 删除投标管理
      */
-    @PreAuthorize("@ss.hasPermi('oa:tender:remove')")
     @Log(title = "投标管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{tenderIds}")
     public AjaxResult remove(@PathVariable String[] tenderIds)