diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/accessToken/dto/QyAccessTokenDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/accessToken/dto/QyAccessTokenDTO.java index 114d4f3..5188749 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/accessToken/dto/QyAccessTokenDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/accessToken/dto/QyAccessTokenDTO.java @@ -18,10 +18,10 @@ public class QyAccessTokenDTO { if (entity != null) { BeanUtil.copyProperties(entity, this); - SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); + /*SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); if (creator != null) { this.operator = creator.getUsername(); - } + }*/ } } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/auth/dto/QyAuthDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/auth/dto/QyAuthDTO.java index 78f1c80..21e262d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/auth/dto/QyAuthDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/auth/dto/QyAuthDTO.java @@ -18,10 +18,10 @@ public class QyAuthDTO { if (entity != null) { BeanUtil.copyProperties(entity, this); - SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); + /*SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); if (creator != null) { this.operator = creator.getUsername(); - } + }*/ this.timeStampStr = entity.getTimeStamp(); } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/dto/QyAuthCorpInfoDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/dto/QyAuthCorpInfoDTO.java index b6a9bb9..7352f2f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/dto/QyAuthCorpInfoDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/dto/QyAuthCorpInfoDTO.java @@ -18,10 +18,10 @@ public class QyAuthCorpInfoDTO { if (entity != null) { BeanUtil.copyProperties(entity, this); - SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); + /*SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); if (creator != null) { this.operator = creator.getUsername(); - } + }*/ } } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/department/dto/QyDepartmentDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/department/dto/QyDepartmentDTO.java index 2c39c52..952536b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/department/dto/QyDepartmentDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/department/dto/QyDepartmentDTO.java @@ -16,10 +16,10 @@ public class QyDepartmentDTO { if (entity != null) { BeanUtil.copyProperties(entity, this); - SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); + /*SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); if (creator != null) { this.operator = creator.getUsername(); - } + }*/ this.enableStatus = "1".equals(entity.getEnable()) ? "启用" : "停用"; } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/message/dto/QyMessageDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/message/dto/QyMessageDTO.java index 5a5062e..a51d5c8 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/message/dto/QyMessageDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/message/dto/QyMessageDTO.java @@ -18,10 +18,10 @@ public class QyMessageDTO { if (entity != null) { BeanUtil.copyProperties(entity, this); - SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); + /*SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); if (creator != null) { this.operator = creator.getUsername(); - } + }*/ this.sendTimeStr = DateUtil.format(entity.getSendTime(), "yyyy-MM-dd HH:mm:ss"); this.recallStateStr = convertRecallState(entity.getRecallState()); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java index 511c3ad..3777fa7 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java @@ -18,10 +18,10 @@ public class QyTemplateDTO { if (entity != null) { BeanUtil.copyProperties(entity, this); - SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); + /*SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); if (creator != null) { this.operator = creator.getUsername(); - } + }*/ this.enableStatus = "1".equals(entity.getEnable()) ? "启用" : "停用"; this.gettokenTimeStr = DateUtil.format(entity.getGettokenTime(), "yyyy-MM-dd HH:mm:ss"); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/db/QyUserServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/db/QyUserServiceImpl.java index 3e2bb9b..aaa06ce 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/db/QyUserServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/db/QyUserServiceImpl.java @@ -21,7 +21,7 @@ public class QyUserServiceImpl extends ServiceImpl i @Override public Page getUserList(AbstractPageQuery query) { - return this.page(query.toPage(), query.toQueryWrapper()); + return baseMapper.getUserList(query.toPage(), query.toQueryWrapper()); } @Override diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java index f5c1c33..59dd690 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java @@ -24,10 +24,10 @@ public class QyUserDTO { if (entity != null) { BeanUtil.copyProperties(entity, this); - SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); + /*SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); if (creator != null) { this.operator = creator.getUsername(); - } + }*/ this.enableStatus = "1".equals(entity.getEnable()) ? "启用" : "停用"; this.createTimeStr = DateUtil.format(entity.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/query/SearchQyUserQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/query/SearchQyUserQuery.java index a45b2ab..e37d78b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/query/SearchQyUserQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/query/SearchQyUserQuery.java @@ -33,7 +33,8 @@ public class SearchQyUserQuery extends AbstractPageQuery { .eq(StrUtil.isNotBlank(department), "department", department) .eq(StrUtil.isNotBlank(mainDepartment), "main_department", mainDepartment) .eq(StrUtil.isNotBlank(enable), "enable", enable) - .between(startTime != null && endTime != null, "create_time", startTime, endTime); + .between(startTime != null && endTime != null, "create_time", startTime, endTime) + .orderByDesc("id"); this.timeRangeColumn = "create_time"; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java index 8a693a6..7c6064f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java @@ -21,10 +21,10 @@ public class NoticeDTO { this.status = entity.getStatus(); this.createTime = entity.getCreateTime(); - SysUserEntity cacheUser = CacheCenter.userCache.getObjectById(entity.getCreatorId()); + /*SysUserEntity cacheUser = CacheCenter.userCache.getObjectById(entity.getCreatorId()); if (cacheUser != null) { this.creatorName = cacheUser.getUsername(); - } + }*/ } }