bug 修改

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")

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));

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);
             }

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));

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>