From d34bbbc39dfbd0d5293af37143b59352a069ee0b Mon Sep 17 00:00:00 2001
From: dx <1242347652@qq.com>
Date: Thu, 27 Feb 2025 11:23:39 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/admin/auth/vo/AuthPermissionInfoRespVO.java | 3 +++
.../yudao/module/system/job/TaskSendStartMessageJob.java | 2 +-
.../yudao/module/system/service/auth/AdminAuthServiceImpl.java | 1 -
.../module/system/service/taskinfo/TaskInfoServiceImpl.java | 2 +-
.../src/main/resources/mapper/taskinfo/TaskInfoMapper.xml | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java
index bd34483..76069ec 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java
@@ -59,6 +59,9 @@ public class AuthPermissionInfoRespVO {
@Schema(description = "用户审核状态", example = "1")
private Integer audit;
+ @Schema(description = "用户类型", example = "1")
+ private Integer userType;
+
}
@Schema(description = "管理后台 - 登录用户的菜单信息 Response VO")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java
index 46c0b0c..737bec5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java
@@ -58,7 +58,7 @@ public class TaskSendStartMessageJob implements JobHandler {
reqDTO.setPage("sub/task/detail?id="+beforeTaskInfo.getId());
reqDTO.setUserId(x.getUserId());
Map<String, String> message = new HashMap<>();
- message.put("thing2", beforeTaskInfo.getTitle());
+ message.put("thing2", StringUtil.truncateString(beforeTaskInfo.getTitle(), 15));
message.put("time3", DateUtil.format(beforeTaskInfo.getStartDate().atStartOfDay(), DateUtils.FORMAT_YEAR_MONTH_DAY));
message.put("thing4", StringUtil.truncateString(beforeTaskInfo.getDescription(), 15));
message.put("time5", DateUtil.format(beforeTaskInfo.getEndDate().atStartOfDay(), DateUtils.FORMAT_YEAR_MONTH_DAY));
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
index 1a88477..8bb13d7 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
@@ -329,7 +329,6 @@ public class AdminAuthServiceImpl implements AdminAuthService {
socialUser.setRawUserInfo(authUser.getRawUserInfo() != null? authUser.getRawUserInfo().toString(): "default");
final int insert = socialUserMapper.insert(socialUser);
-
if (insert < 0) {
throw exception(INSERT_ERROR);
}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java
index aede359..e54ca73 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java
@@ -339,7 +339,7 @@ public class TaskInfoServiceImpl implements TaskInfoService {
reqDTO.setPage("sub/task/detail?id="+taskInfoDO.getId());
reqDTO.setUserId(enterpriseInspectionsDO.getUserId());
Map<String, String> message = new HashMap<>();
- message.put("thing2", taskInfoDO.getTitle());
+ message.put("thing2", StringUtil.truncateString(taskInfoDO.getTitle(), 15));
message.put("time3", DateUtil.format(taskInfoDO.getStartDate(), DateUtils.FORMAT_YEAR_MONTH_DAY));
message.put("thing4", StringUtil.truncateString(taskInfoDO.getDescription(), 15));
message.put("time5", DateUtil.format(taskInfoDO.getEndDate(), DateUtils.FORMAT_YEAR_MONTH_DAY));
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml
index 9ab8f2b..70a9606 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml
@@ -103,7 +103,7 @@
enterprise_qualification eq
LEFT JOIN enterprises e ON eq.enterprise_id = e.id
WHERE
- e.deleted = 0 and eq.deleted = 0 AND expiry_date < NOW()
+ e.deleted = 0 and eq.deleted = 0 AND expiry_date < DATE(NOW())
<if test="deptId != null and deptId != ''">
and e.department_id = #{deptId}
</if>