From 97cfdf1f572bd17265a634bfc36d58dce5e372b7 Mon Sep 17 00:00:00 2001 From: zhoumingfa Date: Tue, 8 Apr 2025 22:00:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=81=E4=B8=9A=E7=AE=A1?= =?UTF-8?q?=E7=90=86demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/oa/bank/BankController.java | 7 ++ .../oa/enterprise/EnterpriseController.java | 3 + .../oa/invoice/InvoiceController.java | 9 +- .../business/oa/bank/BankController.java | 7 ++ .../oa/enterprise/EnterpriseController.java | 3 + .../oa/invoice/InvoiceController.java | 9 +- .../components/enterprise-bank-list.vue | 6 +- .../enterprise-bank-operate-modal.vue | 4 +- .../components/enterprise-employee-list.vue | 93 +++++++++++-------- .../components/enterprise-invoice-list.vue | 8 +- .../enterprise-invoice-operate-modal.vue | 4 +- .../components/enterprise-operate-modal.vue | 13 ++- .../oa/enterprise/enterprise-detail.vue | 12 ++- .../oa/enterprise/enterprise-list.vue | 4 +- .../components/enterprise-bank-list.vue | 6 +- .../enterprise-bank-operate-modal.vue | 4 +- .../components/enterprise-employee-list.vue | 93 +++++++++++-------- .../components/enterprise-invoice-list.vue | 9 +- .../enterprise-invoice-operate-modal.vue | 4 +- .../components/enterprise-operate-modal.vue | 13 ++- .../oa/enterprise/enterprise-detail.vue | 12 ++- .../oa/enterprise/enterprise-list.vue | 4 +- sql/smart_admin_v3.sql | 13 ++- 23 files changed, 221 insertions(+), 119 deletions(-) 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-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-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 -->