From 05e91f77862e3e53fe1f4d6574185b4e88a489af Mon Sep 17 00:00:00 2001 From: kkaiyun <9438243+i-ill@user.noreply.gitee.com> Date: Wed, 10 May 2023 20:09:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/code-generator-template/js/list.vue.vm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 a7d3fdf1..3d278181 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(); From 29a67c6340fc5bdfaf776999438c8aaacbea0871 Mon Sep 17 00:00:00 2001 From: peter zhang Date: Fri, 12 May 2023 14:58:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix=20disableFlag=20=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=AF=BC=E8=87=B4token=20=E6=9C=AA=E7=A7=BB?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/employee/service/EmployeeService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 d41ff6e3..a315397d 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); From f0f317ab53bdbb61d5714d73431d874eb4678f96 Mon Sep 17 00:00:00 2001 From: peter zhang Date: Fri, 12 May 2023 15:19:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E7=9B=91=E6=8E=A7>=E8=AF=B7=E6=B1=82=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=86=85=E5=AE=B9=E7=9A=84=20=E5=88=97?= =?UTF-8?q?=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/support/operate-log/operate-log-detail-modal.vue | 2 +- .../src/views/support/operate-log/operate-log-detail-modal.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue index 5cb6146e..411d7518 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue @@ -22,7 +22,7 @@ 用户id：{{ detail.operateUserId }} 用户名称： {{ detail.operateUserName }} - 请求内容： {{ detail.module }} - {{ detail.content }} + 请求内容： {{ detail.module }} - {{ detail.content }} diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue index aaec01d7..34548315 100644 --- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue +++ b/smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue @@ -22,7 +22,7 @@ 用户id：{{ detail.operateUserId }} 用户名称： {{ detail.operateUserName }} - 请求内容： {{ detail.module }} - {{ detail.content }} + 请求内容： {{ detail.module }} - {{ detail.content }} From fdea2dd1696e8bc4d5e5e779534e6a7d595d584f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=9C=E5=8F=B6?= Date: Wed, 17 May 2023 12:41:52 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B940X=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=8C=E6=AD=A3=E7=A1=AE=E4=BB=A3=E7=A0=81=E5=BA=94=E4=B8=BA?= =?UTF-8?q?404=E5=AF=B9=E5=BA=94=E9=A1=B5=E9=9D=A2=E6=9C=AA=E6=89=BE?= =?UTF-8?q?=E5=88=B0=EF=BC=8C403=E5=AF=B9=E5=BA=94=E8=A2=AB=E7=A6=81?= =?UTF-8?q?=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 霜叶 --- .../javascript-ant-design-vue3/src/views/system/40X/403.vue | 2 +- .../javascript-ant-design-vue3/src/views/system/40X/404.vue | 4 ++-- .../typescript-ant-design-vue3/src/views/system/40X/403.vue | 2 +- .../typescript-ant-design-vue3/src/views/system/40X/404.vue | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/403.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/403.vue index 5723fea7..31445e31 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/403.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/403.vue @@ -8,7 +8,7 @@ * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 -->