From 2c6bef91e89206a4d52361bd8be18e9b1bfe2875 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 30 Jan 2023 21:28:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=B0=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=92=E5=BA=8F=E7=94=B1=E6=8C=89=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=99=8D=E5=BA=8F=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E9=99=8D=E5=BA=8F?= =?UTF-8?q?=EF=BC=88=E9=81=BF=E5=85=8D=E4=BF=AE=E6=94=B9=E5=90=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=AE=B0=E5=BD=95=E7=A7=BB=E5=8A=A8=EF=BC=89=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=AE=A1=E8=AE=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=94=B1=E2=80=9C=E4=BF=AE=E6=94=B9=E4=BA=BA?= =?UTF-8?q?=E2=80=9D=E3=80=81=E2=80=9C=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E2=80=9D=E8=B0=83=E6=95=B4=E5=B1=95=E7=A4=BA=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA=E2=80=9D=E3=80=81=E2=80=9C=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E2=80=9D=EF=BC=8C=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E6=B6=89=E5=8F=8A=E5=AE=8C=E6=95=B4=E5=AE=A1=E8=AE=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=B0=86=E5=9C=A8=E8=AF=A6=E6=83=85=E4=B8=AD=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/common/base/BaseDetailVO.java | 16 ++++++++-------- .../charles7c/cnadmin/common/base/BaseVO.java | 16 ++++++++-------- .../monitor/service/impl/LogServiceImpl.java | 2 +- .../system/service/impl/DeptServiceImpl.java | 10 +++++----- continew-admin-ui/src/api/system/dept.ts | 4 ++-- .../src/views/system/dept/index.vue | 12 ++++++------ 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailVO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailVO.java index fcb8604d..73f963ff 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailVO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailVO.java @@ -36,20 +36,20 @@ public class BaseDetailVO extends BaseVO { private static final long serialVersionUID = 1L; /** - * 创建人 + * 修改人 */ @JsonIgnore - private Long createUser; + private Long updateUser; /** - * 创建人 + * 修改人 */ - @Schema(description = "创建人") - private String createUserString; + @Schema(description = "修改人") + private String updateUserString; /** - * 创建时间 + * 修改时间 */ - @Schema(description = "创建时间") - private LocalDateTime createTime; + @Schema(description = "修改时间") + private LocalDateTime updateTime; } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseVO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseVO.java index 37be9a85..f60a42ec 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseVO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseVO.java @@ -37,20 +37,20 @@ public class BaseVO implements Serializable { private static final long serialVersionUID = 1L; /** - * 修改人 + * 创建人 */ @JsonIgnore - private Long updateUser; + private Long createUser; /** - * 修改人 + * 创建人 */ - @Schema(description = "修改人") - private String updateUserString; + @Schema(description = "创建人") + private String createUserString; /** - * 修改时间 + * 创建时间 */ - @Schema(description = "修改时间") - private LocalDateTime updateTime; + @Schema(description = "创建时间") + private LocalDateTime createTime; } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java index 90177aaa..0058598c 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java @@ -154,6 +154,6 @@ public class LogServiceImpl implements LogService { return; } logVO.setCreateUserString( - ExceptionUtils.exToNull(() -> userService.getById(logVO.getCreateUser())).getNickname()); + ExceptionUtils.exToNull(() -> userService.getById(createUser)).getNickname()); } } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java index d5b758e0..6b3f3e06 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java @@ -64,7 +64,7 @@ public class DeptServiceImpl extends public List list(DeptQuery query) { QueryWrapper queryWrapper = QueryHelper.build(query); queryWrapper.lambda().orderByAsc(DeptDO::getParentId).orderByAsc(DeptDO::getDeptSort) - .orderByDesc(DeptDO::getUpdateTime); + .orderByDesc(DeptDO::getCreateTime); List deptList = baseMapper.selectList(queryWrapper); List list = BeanUtil.copyToList(deptList, DeptVO.class); list.forEach(this::fill); @@ -174,11 +174,11 @@ public class DeptServiceImpl extends * 部门信息 */ private void fill(DeptVO deptVO) { - Long updateUser = deptVO.getUpdateUser(); - if (updateUser == null) { + Long createUser = deptVO.getCreateUser(); + if (createUser == null) { return; } - deptVO.setUpdateUserString( - ExceptionUtils.exToNull(() -> userService.getById(deptVO.getUpdateUser())).getNickname()); + deptVO.setCreateUserString( + ExceptionUtils.exToNull(() -> userService.getById(createUser)).getNickname()); } } diff --git a/continew-admin-ui/src/api/system/dept.ts b/continew-admin-ui/src/api/system/dept.ts index 111497e0..02822c7b 100644 --- a/continew-admin-ui/src/api/system/dept.ts +++ b/continew-admin-ui/src/api/system/dept.ts @@ -8,8 +8,8 @@ export interface DeptRecord { deptSort: number; description: string; status?: number; - updateUserString: string; - updateTime: string; + createUserString: string; + createTime: string; children: Array, } diff --git a/continew-admin-ui/src/views/system/dept/index.vue b/continew-admin-ui/src/views/system/dept/index.vue index 02baf762..c380e1b1 100644 --- a/continew-admin-ui/src/views/system/dept/index.vue +++ b/continew-admin-ui/src/views/system/dept/index.vue @@ -369,12 +369,12 @@ dataIndex: 'description', }, { - title: '修改人', - dataIndex: 'updateUserString', + title: '创建人', + dataIndex: 'createUserString', }, { - title: '修改时间', - dataIndex: 'updateTime', + title: '创建时间', + dataIndex: 'createTime', }, { title: '操作', @@ -502,8 +502,8 @@ deptSort: 999, description: '', status: undefined, - updateUserString: '', - updateTime: '', + createUserString: '', + createTime: '', children: [], }); const rules = computed((): Record => {