diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java index f17cbd45..e165817e 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.oa.bank; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -35,24 +36,28 @@ public class BankController { @Operation(summary = "分页查询银行信息 @author 善逸") @PostMapping("/oa/bank/page/query") + @SaCheckPermission("oa:bank:query") public ResponseDTO> queryByPage(@RequestBody @Valid BankQueryForm queryForm) { return bankService.queryByPage(queryForm); } @Operation(summary = "根据企业ID查询银行信息列表 @author 善逸") @GetMapping("/oa/bank/query/list/{enterpriseId}") + @SaCheckPermission("oa:bank:query") public ResponseDTO> queryList(@PathVariable Long enterpriseId) { return bankService.queryList(enterpriseId); } @Operation(summary = "查询银行信息详情 @author 善逸") @GetMapping("/oa/bank/get/{bankId}") + @SaCheckPermission("oa:bank:query") public ResponseDTO getDetail(@PathVariable Long bankId) { return bankService.getDetail(bankId); } @Operation(summary = "新建银行信息 @author 善逸") @PostMapping("/oa/bank/create") + @SaCheckPermission("oa:bank:add") public ResponseDTO createBank(@RequestBody @Valid BankCreateForm createVO) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); createVO.setCreateUserId(requestUser.getUserId()); @@ -62,12 +67,14 @@ public class BankController { @Operation(summary = "编辑银行信息 @author 善逸") @PostMapping("/oa/bank/update") + @SaCheckPermission("oa:bank:update") public ResponseDTO updateBank(@RequestBody @Valid BankUpdateForm updateVO) { return bankService.updateBank(updateVO); } @Operation(summary = "删除银行信息 @author 善逸") @GetMapping("/oa/bank/delete/{bankId}") + @SaCheckPermission("oa:bank:delete") public ResponseDTO deleteBank(@PathVariable Long bankId) { return bankService.deleteBank(bankId); } diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java index ad904791..d919537b 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java @@ -100,6 +100,7 @@ public class EnterpriseController { @Operation(summary = "按照类型查询企业 @author 开云") @GetMapping("/oa/enterprise/query/list") + @SaCheckPermission("oa:enterprise:query") public ResponseDTO> queryList(@RequestParam(value = "type", required = false) Integer type) { return enterpriseService.queryList(type); } @@ -114,12 +115,14 @@ public class EnterpriseController { @Operation(summary = "查询企业全部员工 @author 罗伊") @PostMapping("/oa/enterprise/employee/list") + @SaCheckPermission("oa:enterprise:queryEmployee") public ResponseDTO> employeeList(@RequestBody @Valid List enterpriseIdList) { return ResponseDTO.ok(enterpriseService.employeeList(enterpriseIdList)); } @Operation(summary = "分页查询企业员工 @author 卓大") @PostMapping("/oa/enterprise/employee/queryPage") + @SaCheckPermission("oa:enterprise:queryEmployee") public ResponseDTO> queryPageEmployeeList(@RequestBody @Valid EnterpriseEmployeeQueryForm queryForm) { return ResponseDTO.ok(enterpriseService.queryPageEmployeeList(queryForm)); } diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java index 52b5ea50..13d3b98f 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.oa.invoice; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -38,18 +39,21 @@ public class InvoiceController { @Operation(summary = "分页查询发票信息 @author 善逸") @PostMapping("/oa/invoice/page/query") + @SaCheckPermission("oa:invoice:query") public ResponseDTO> queryByPage(@RequestBody @Valid InvoiceQueryForm queryForm) { return invoiceService.queryByPage(queryForm); } @Operation(summary = "查询发票信息详情 @author 善逸") @GetMapping("/oa/invoice/get/{invoiceId}") + @SaCheckPermission("oa:invoice:query") public ResponseDTO getDetail(@PathVariable Long invoiceId) { return invoiceService.getDetail(invoiceId); } @Operation(summary = "新建发票信息 @author 善逸") @PostMapping("/oa/invoice/create") + @SaCheckPermission("oa:invoice:add") public ResponseDTO createInvoice(@RequestBody @Valid InvoiceAddForm createVO) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); createVO.setCreateUserId(requestUser.getUserId()); @@ -57,21 +61,24 @@ public class InvoiceController { return invoiceService.createInvoice(createVO); } + @OperateLog @Operation(summary = "编辑发票信息 @author 善逸") @PostMapping("/oa/invoice/update") - @OperateLog + @SaCheckPermission("oa:invoice:update") public ResponseDTO updateInvoice(@RequestBody @Valid InvoiceUpdateForm updateVO) { return invoiceService.updateInvoice(updateVO); } @Operation(summary = "删除发票信息 @author 善逸") @GetMapping("/invoice/delete/{invoiceId}") + @SaCheckPermission("oa:invoice:delete") public ResponseDTO deleteInvoice(@PathVariable Long invoiceId) { return invoiceService.deleteInvoice(invoiceId); } @Operation(summary = "查询列表 @author lidoudou") @GetMapping("/oa/invoice/query/list/{enterpriseId}") + @SaCheckPermission("oa:invoice:query") public ResponseDTO> queryList(@PathVariable Long enterpriseId) { return invoiceService.queryList(enterpriseId); } diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java index cb5f5f01..4c4fded8 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java @@ -52,43 +52,43 @@ public class AdminDictController extends SupportBaseController { @Operation(summary = "分页查询 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/queryPage") - @SaCheckPermission("dict:query") + @SaCheckPermission("support:dict:query") public ResponseDTO> queryPage(@RequestBody @Valid DictQueryForm queryForm) { return ResponseDTO.ok(dictService.queryPage(queryForm)); } @Operation(summary = "添加 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/add") - @SaCheckPermission("dict:add") + @SaCheckPermission("support:dict:add") public ResponseDTO add(@RequestBody @Valid DictAddForm addForm) { return dictService.add(addForm); } @Operation(summary = "更新 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/update") - @SaCheckPermission("dict:update") + @SaCheckPermission("support:dict:update") public ResponseDTO update(@RequestBody @Valid DictUpdateForm updateForm) { return dictService.update(updateForm); } - @Operation(summary = "字典数据 启用/禁用 @author 1024创新实验室-主任-卓大") + @Operation(summary = "启用/禁用 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/updateDisabled/{dictId}") - @SaCheckPermission("dictData:updateDisabled") + @SaCheckPermission("support:dict:updateDisabled") public ResponseDTO updateDisabled(@PathVariable Long dictId) { return dictService.updateDisabled(dictId); } @Operation(summary = "批量删除 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/batchDelete") - @SaCheckPermission("dict:delete") + @SaCheckPermission("support:dict:delete") public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return dictService.batchDelete(idList); } @Operation(summary = "单个删除 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/delete/{dictId}") - @SaCheckPermission("dict:delete") - public ResponseDTO batchDelete(@PathVariable Long dictId) { + @SaCheckPermission("support:dict:delete") + public ResponseDTO delete(@PathVariable Long dictId) { return dictService.delete(dictId); } @@ -96,42 +96,42 @@ public class AdminDictController extends SupportBaseController { @Operation(summary = "字典数据 分页查询 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/dictData/queryDictData/{dictId}") - @SaCheckPermission("dictData:query") + @SaCheckPermission("support:dictData:query") public ResponseDTO> queryDictData(@PathVariable Long dictId) { return ResponseDTO.ok(dictService.queryDictData(dictId)); } @Operation(summary = "字典数据 启用/禁用 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/dictData/updateDisabled/{dictDataId}") - @SaCheckPermission("dictData:updateDisabled") + @SaCheckPermission("support:dictData:updateDisabled") public ResponseDTO updateDictDataDisabled(@PathVariable Long dictDataId) { return dictService.updateDictDataDisabled(dictDataId); } @Operation(summary = "字典数据 添加 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/dictData/add") - @SaCheckPermission("dictData:add") + @SaCheckPermission("support:dictData:add") public ResponseDTO addDictData(@RequestBody @Valid DictDataAddForm addForm) { return dictService.addDictData(addForm); } @Operation(summary = "字典数据 更新 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/dictData/update") - @SaCheckPermission("dictData:update") + @SaCheckPermission("support:dictData:update") public ResponseDTO updateDictData(@RequestBody @Valid DictDataUpdateForm updateForm) { return dictService.updateDictData(updateForm); } @Operation(summary = "字典数据 批量删除 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/dictData/batchDelete") - @SaCheckPermission("dictData:delete") + @SaCheckPermission("support:dictData:delete") public ResponseDTO batchDeleteDictData(@RequestBody ValidateList idList) { return dictService.batchDeleteDictData(idList); } @Operation(summary = "字典数据 单个删除 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/dictData/delete/{dictDataId}") - @SaCheckPermission("dictData:delete") + @SaCheckPermission("support:dictData:delete") public ResponseDTO deleteDictData(@PathVariable Long dictDataId) { return dictService.deleteDictData(dictDataId); } diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java index 6e1f8ed7..51a7c4c7 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.oa.bank; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import net.lab1024.sa.admin.constant.AdminSwaggerTagConst; @@ -35,24 +36,28 @@ public class BankController { @Operation(summary = "分页查询银行信息 @author 善逸") @PostMapping("/oa/bank/page/query") + @SaCheckPermission("oa:bank:query") public ResponseDTO> queryByPage(@RequestBody @Valid BankQueryForm queryForm) { return bankService.queryByPage(queryForm); } @Operation(summary = "根据企业ID查询银行信息列表 @author 善逸") @GetMapping("/oa/bank/query/list/{enterpriseId}") + @SaCheckPermission("oa:bank:query") public ResponseDTO> queryList(@PathVariable Long enterpriseId) { return bankService.queryList(enterpriseId); } @Operation(summary = "查询银行信息详情 @author 善逸") @GetMapping("/oa/bank/get/{bankId}") + @SaCheckPermission("oa:bank:query") public ResponseDTO getDetail(@PathVariable Long bankId) { return bankService.getDetail(bankId); } @Operation(summary = "新建银行信息 @author 善逸") @PostMapping("/oa/bank/create") + @SaCheckPermission("oa:bank:add") public ResponseDTO createBank(@RequestBody @Valid BankCreateForm createVO) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); createVO.setCreateUserId(requestUser.getUserId()); @@ -62,12 +67,14 @@ public class BankController { @Operation(summary = "编辑银行信息 @author 善逸") @PostMapping("/oa/bank/update") + @SaCheckPermission("oa:bank:update") public ResponseDTO updateBank(@RequestBody @Valid BankUpdateForm updateVO) { return bankService.updateBank(updateVO); } @Operation(summary = "删除银行信息 @author 善逸") @GetMapping("/oa/bank/delete/{bankId}") + @SaCheckPermission("oa:bank:delete") public ResponseDTO deleteBank(@PathVariable Long bankId) { return bankService.deleteBank(bankId); } diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java index 211a1140..8ef807fa 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java @@ -100,6 +100,7 @@ public class EnterpriseController { @Operation(summary = "按照类型查询企业 @author 开云") @GetMapping("/oa/enterprise/query/list") + @SaCheckPermission("oa:enterprise:query") public ResponseDTO> queryList(@RequestParam(value = "type", required = false) Integer type) { return enterpriseService.queryList(type); } @@ -114,12 +115,14 @@ public class EnterpriseController { @Operation(summary = "查询企业全部员工 @author 罗伊") @PostMapping("/oa/enterprise/employee/list") + @SaCheckPermission("oa:enterprise:queryEmployee") public ResponseDTO> employeeList(@RequestBody @Valid List enterpriseIdList) { return ResponseDTO.ok(enterpriseService.employeeList(enterpriseIdList)); } @Operation(summary = "分页查询企业员工 @author 卓大") @PostMapping("/oa/enterprise/employee/queryPage") + @SaCheckPermission("oa:enterprise:queryEmployee") public ResponseDTO> queryPageEmployeeList(@RequestBody @Valid EnterpriseEmployeeQueryForm queryForm) { return ResponseDTO.ok(enterpriseService.queryPageEmployeeList(queryForm)); } diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java index 6b481897..fb3270ef 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.oa.invoice; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; @@ -38,18 +39,21 @@ public class InvoiceController { @Operation(summary = "分页查询发票信息 @author 善逸") @PostMapping("/oa/invoice/page/query") + @SaCheckPermission("oa:invoice:query") public ResponseDTO> queryByPage(@RequestBody @Valid InvoiceQueryForm queryForm) { return invoiceService.queryByPage(queryForm); } @Operation(summary = "查询发票信息详情 @author 善逸") @GetMapping("/oa/invoice/get/{invoiceId}") + @SaCheckPermission("oa:invoice:query") public ResponseDTO getDetail(@PathVariable Long invoiceId) { return invoiceService.getDetail(invoiceId); } @Operation(summary = "新建发票信息 @author 善逸") @PostMapping("/oa/invoice/create") + @SaCheckPermission("oa:invoice:add") public ResponseDTO createInvoice(@RequestBody @Valid InvoiceAddForm createVO) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); createVO.setCreateUserId(requestUser.getUserId()); @@ -57,21 +61,24 @@ public class InvoiceController { return invoiceService.createInvoice(createVO); } + @OperateLog @Operation(summary = "编辑发票信息 @author 善逸") @PostMapping("/oa/invoice/update") - @OperateLog + @SaCheckPermission("oa:invoice:update") public ResponseDTO updateInvoice(@RequestBody @Valid InvoiceUpdateForm updateVO) { return invoiceService.updateInvoice(updateVO); } @Operation(summary = "删除发票信息 @author 善逸") @GetMapping("/invoice/delete/{invoiceId}") + @SaCheckPermission("oa:invoice:delete") public ResponseDTO deleteInvoice(@PathVariable Long invoiceId) { return invoiceService.deleteInvoice(invoiceId); } @Operation(summary = "查询列表 @author lidoudou") @GetMapping("/oa/invoice/query/list/{enterpriseId}") + @SaCheckPermission("oa:invoice:query") public ResponseDTO> queryList(@PathVariable Long enterpriseId) { return invoiceService.queryList(enterpriseId); } diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java index 17d6e8a5..3a7327b4 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java @@ -52,43 +52,43 @@ public class AdminDictController extends SupportBaseController { @Operation(summary = "分页查询 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/queryPage") - @SaCheckPermission("dict:query") + @SaCheckPermission("support:dict:query") public ResponseDTO> queryPage(@RequestBody @Valid DictQueryForm queryForm) { return ResponseDTO.ok(dictService.queryPage(queryForm)); } @Operation(summary = "添加 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/add") - @SaCheckPermission("dict:add") + @SaCheckPermission("support:dict:add") public ResponseDTO add(@RequestBody @Valid DictAddForm addForm) { return dictService.add(addForm); } @Operation(summary = "更新 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/update") - @SaCheckPermission("dict:update") + @SaCheckPermission("support:dict:update") public ResponseDTO update(@RequestBody @Valid DictUpdateForm updateForm) { return dictService.update(updateForm); } - @Operation(summary = "字典数据 启用/禁用 @author 1024创新实验室-主任-卓大") + @Operation(summary = "启用/禁用 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/updateDisabled/{dictId}") - @SaCheckPermission("dictData:updateDisabled") + @SaCheckPermission("support:dict:updateDisabled") public ResponseDTO updateDisabled(@PathVariable Long dictId) { return dictService.updateDisabled(dictId); } @Operation(summary = "批量删除 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/batchDelete") - @SaCheckPermission("dict:delete") + @SaCheckPermission("support:dict:delete") public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return dictService.batchDelete(idList); } @Operation(summary = "单个删除 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/delete/{dictId}") - @SaCheckPermission("dict:delete") - public ResponseDTO batchDelete(@PathVariable Long dictId) { + @SaCheckPermission("support:dict:delete") + public ResponseDTO delete(@PathVariable Long dictId) { return dictService.delete(dictId); } @@ -96,42 +96,42 @@ public class AdminDictController extends SupportBaseController { @Operation(summary = "字典数据 分页查询 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/dictData/queryDictData/{dictId}") - @SaCheckPermission("dictData:query") + @SaCheckPermission("support:dictData:query") public ResponseDTO> queryDictData(@PathVariable Long dictId) { return ResponseDTO.ok(dictService.queryDictData(dictId)); } @Operation(summary = "字典数据 启用/禁用 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/dictData/updateDisabled/{dictDataId}") - @SaCheckPermission("dictData:updateDisabled") + @SaCheckPermission("support:dictData:updateDisabled") public ResponseDTO updateDictDataDisabled(@PathVariable Long dictDataId) { return dictService.updateDictDataDisabled(dictDataId); } @Operation(summary = "字典数据 添加 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/dictData/add") - @SaCheckPermission("dictData:add") + @SaCheckPermission("support:dictData:add") public ResponseDTO addDictData(@RequestBody @Valid DictDataAddForm addForm) { return dictService.addDictData(addForm); } @Operation(summary = "字典数据 更新 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/dictData/update") - @SaCheckPermission("dictData:update") + @SaCheckPermission("support:dictData:update") public ResponseDTO updateDictData(@RequestBody @Valid DictDataUpdateForm updateForm) { return dictService.updateDictData(updateForm); } @Operation(summary = "字典数据 批量删除 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/dictData/batchDelete") - @SaCheckPermission("dictData:delete") + @SaCheckPermission("support:dictData:delete") public ResponseDTO batchDeleteDictData(@RequestBody ValidateList idList) { return dictService.batchDeleteDictData(idList); } @Operation(summary = "字典数据 单个删除 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/dictData/delete/{dictDataId}") - @SaCheckPermission("dictData:delete") + @SaCheckPermission("support:dictData:delete") public ResponseDTO deleteDictData(@PathVariable Long dictDataId) { return dictService.deleteDictData(dictDataId); } diff --git a/smart-admin-web-javascript/src/constants/system/menu-const.js b/smart-admin-web-javascript/src/constants/system/menu-const.js index 948e3e2a..6adf4b10 100644 --- a/smart-admin-web-javascript/src/constants/system/menu-const.js +++ b/smart-admin-web-javascript/src/constants/system/menu-const.js @@ -18,7 +18,7 @@ export const MENU_TYPE_ENUM = { }, POINTS: { value: 3, - desc: '按钮', + desc: '功能点', }, }; diff --git a/smart-admin-web-javascript/src/plugins/privilege-plugin.js b/smart-admin-web-javascript/src/plugins/privilege-plugin.js index 547b2593..5ae11040 100644 --- a/smart-admin-web-javascript/src/plugins/privilege-plugin.js +++ b/smart-admin-web-javascript/src/plugins/privilege-plugin.js @@ -20,7 +20,7 @@ const privilege = (value) => { if (!userPointsList) { return false; } - return _.some(userPointsList, ['apiPerms', value]); + return _.some(userPointsList, ['webPerms', value]); }; export default { diff --git a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue index bb5ecc3e..283bd81e 100644 --- a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue +++ b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue @@ -36,7 +36,7 @@ - + @@ -60,8 +60,8 @@ diff --git a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue index 73721263..dcd33c18 100644 --- a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue +++ b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue @@ -8,8 +8,8 @@ * @Copyright 1024创新实验室 ( https://1024lab.net ),Since 2012 --> diff --git a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue index fee387a8..a8634f8b 100644 --- a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue +++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue @@ -8,8 +8,8 @@ * @Copyright 1024创新实验室 ( https://1024lab.net ),Since 2012 -->