diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java index b1a31cc..7fa863c 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java @@ -38,7 +38,7 @@ public class GoodsController extends AdminBaseController { @ApiOperation("分页查询 @author 胡克") @PostMapping("/goods/query") - @PreAuthorize("@saAuth.checkPermission('goods:query ')") + @PreAuthorize("@saAuth.checkPermission('goods:query')") public ResponseDTO> query(@RequestBody @Valid GoodsQueryForm queryForm) { return goodsService.query(queryForm); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java index d41ff6e..a315397 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java @@ -205,7 +205,10 @@ public class EmployeeService { if (null == employeeEntity) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); } - employeeDao.updateDisableFlag(employeeId, !employeeEntity.getDisabledFlag()); + + boolean disableFlag=!employeeEntity.getDisabledFlag(); + employeeEntity.setDisabledFlag(disableFlag); + employeeDao.updateDisableFlag(employeeId, disableFlag); if (employeeEntity.getDisabledFlag()) { tokenService.batchRemoveRedisToken(employeeId, UserTypeEnum.ADMIN_EMPLOYEE); diff --git a/smart-admin-api/sa-common/src/main/resources/code-generator-template/js/list.vue.vm b/smart-admin-api/sa-common/src/main/resources/code-generator-template/js/list.vue.vm index 0e3163d..83a7d76 100644 --- a/smart-admin-api/sa-common/src/main/resources/code-generator-template/js/list.vue.vm +++ b/smart-admin-api/sa-common/src/main/resources/code-generator-template/js/list.vue.vm @@ -64,7 +64,7 @@
#if($insertAndUpdate.isSupportInsertAndUpdate) - + @@ -245,7 +245,7 @@ function onDelete(data){ Modal.confirm({ title: '提示', - content: '确定要删除选吗?', + content: '确定要删除吗?', okText: '删除', okType: 'danger', onOk() { @@ -260,9 +260,6 @@ async function requestDelete(data){ SmartLoading.show(); try { - let deleteForm = { - goodsIdList: selectedRowKeyList.value, - }; await $!{name.lowerCamel}Api.delete(data.$!{primaryKeyFieldName}); message.success('删除成功'); queryData(); diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/icon-select/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/framework/icon-select/index.vue index 653bade..cb5aaa1 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/icon-select/index.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/components/framework/icon-select/index.vue @@ -1,26 +1,26 @@