修复部分Bug

pom.xml

@@ -62,7 +62,7 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
-                <logging.level>debug</logging.level>
+                <logging.level>trace</logging.level>
                 <monitor.username>ithuanyi</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
@@ -84,7 +84,7 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <logging.level>warn</logging.level>
+                <logging.level>info</logging.level>
                 <monitor.username>yingpaipay</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -32,6 +32,7 @@ import org.dromara.common.core.service.UserService;
 import org.dromara.common.core.utils.*;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.CacheUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.SysUserPost;
@@ -581,6 +582,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteUserById(Long userId) {
+
+        CacheUtils.evict(CacheNames.SYS_NICKNAME, userId);
+        CacheUtils.evict(CacheNames.SYS_USER_NAME, userId);
+
         // 删除用户与角色关联
         userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
         // 删除用户与岗位表
@@ -609,6 +614,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         for (Long userId : userIds) {
             checkUserAllowed(userId);
             checkUserDataScope(userId);
+
+            CacheUtils.evict(CacheNames.SYS_NICKNAME, userId);
+            CacheUtils.evict(CacheNames.SYS_USER_NAME, userId);
+
         }
         List<Long> ids = List.of(userIds);
         // 删除用户与角色关联
@@ -616,9 +625,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         // 删除用户与岗位表
         userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId, ids));
         // 删除用户与项目关联
-        userProjectsMapper.delete(new LambdaQueryWrapper<>(SysUserProjects.class).in(SysUserProjects::getUserId, ids));
+        userProjectsMapper.delete(new LambdaQueryWrapper<SysUserProjects>().in(SysUserProjects::getUserId, ids));
         // 删除用户与文件夹关联
-        userFoldersMapper.delete(new LambdaQueryWrapper<>(SysUserFolders.class).in(SysUserFolders::getUserId, ids));
+        userFoldersMapper.delete(new LambdaQueryWrapper<SysUserFolders>().in(SysUserFolders::getUserId, ids));
+
         // 防止更新失败导致的数据删除
         int flag = baseMapper.deleteByIds(ids);
         if (flag < 1) {
@@ -682,6 +692,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
 
     @Override
     public boolean updateNickname(String nickname) {
+
+        CacheUtils.evict(CacheNames.SYS_NICKNAME, LoginHelper.getUserId());
+
         return baseMapper.update(
             Wrappers.lambdaUpdate(SysUser.class)
                 .eq(SysUser::getUserId, LoginHelper.getUserId())
@@ -714,6 +727,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
 
     @Override
     public boolean updateOnProject(Long id, String nickname, String phoneNumber, String email, String password) {
+
+        CacheUtils.evict(CacheNames.SYS_NICKNAME, id);
+        CacheUtils.evict(CacheNames.SYS_USER_NAME, id);
+
         return baseMapper.update(
             Wrappers.lambdaUpdate(SysUser.class)
                 .eq(SysUser::getUserId, id)

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/domain/bo/AppletScanBo.java

@@ -2,8 +2,6 @@ package com.yingpaipay.business.domain.bo;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class AppletScanBo {
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enumeration/DocumentStatusEnum.java

@@ -29,20 +29,12 @@ public enum DocumentStatusEnum {
         if (value == null) {
             return "";
         }
-        DocumentStatusEnum status = null;
         for (DocumentStatusEnum enumeration : values()) {
             if (enumeration.getValue().equals(value)) {
-                status = enumeration;
+                return LocaleContextHolder.getLocale().getLanguage().equals("zh") ? enumeration.getZhLabel() : enumeration.getEnLabel();
             }
         }
-        if (status == null) {
-            return "";
-        }
-        Locale locale = LocaleContextHolder.getLocale();
-        if (locale.getLanguage().equals("zh")) {
-            return status.getZhLabel();
-        }
-        return status.getEnLabel();
+        throw new IllegalArgumentException("未知状态");
     }
 
 }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enumeration/MailTemplateEnum.java

@@ -586,10 +586,6 @@ public enum MailTemplateEnum {
           </table>
         </body>
         </html>
-        """), TO_QC("", "", """
-
-        """, """
-
         """),
     ;
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/DocumentQcTaskDetailServiceImpl.java

@@ -193,7 +193,6 @@ public class DocumentQcTaskDetailServiceImpl implements IDocumentQcTaskDetailSer
         if (DocumentQcStatusEnum.pass(bo.getResult())) {
             detail.setFinishTime(new Date());
             document.setStatus(DocumentStatusEnum.QC_PASS.getValue());
-
         } else {
             document.setStatus(DocumentStatusEnum.QC_REJECT.getValue());
         }