From 8af9b38aef22e7a08aac50cd2463f33c5ce347e0 Mon Sep 17 00:00:00 2001
From: 777 <123@qwe.com>
Date: Fri, 19 Sep 2025 02:07:47 +0800
Subject: [PATCH] V13

---
 .../web/controller/cai/admin/UserController.java     |  8 ++++++++
 .../ruoyi/cai/controller/UnionTotalController.java   | 12 +++++++++++-
 .../src/main/java/com/ruoyi/cai/im/ImManager.java    |  6 +++++-
 .../main/java/com/ruoyi/cai/service/UserService.java |  2 ++
 .../com/ruoyi/cai/service/impl/UserServiceImpl.java  | 10 ++++++++++
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java
index 948b7e1a..f5ec3a1d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java
@@ -222,4 +222,12 @@ public class UserController extends BaseController {
         userService.enSpeckIm(userId);
         return R.ok();
     }
+
+
+    @Log(title = "刷新用户IM信息", businessType = BusinessType.OTHER)
+    @GetMapping("/refreshImInfo")
+    public R<Void> refreshImInfo(Long userId){
+        userService.refreshImInfo(userId);
+        return R.ok();
+    }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UnionTotalController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UnionTotalController.java
index e36afa12..de48a1e0 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UnionTotalController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UnionTotalController.java
@@ -3,7 +3,9 @@ package com.ruoyi.cai.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.cai.domain.Union;
 import com.ruoyi.cai.domain.UnionTotal;
+import com.ruoyi.cai.service.UnionService;
 import com.ruoyi.cai.service.UnionTotalService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 
 /**
  * 工会每日收益
@@ -34,6 +37,7 @@ import java.time.format.DateTimeFormatter;
 public class UnionTotalController extends BaseController {
 
     private final UnionTotalService unionTotalService;
+    private final UnionService unionService;
 
     /**
      * 查询工会每日收益列表
@@ -41,10 +45,16 @@ public class UnionTotalController extends BaseController {
     @SaCheckPermission("cai:unionTotal:list")
     @GetMapping("/list")
     public TableDataInfo<UnionTotal> list(UnionTotal bo, PageQuery pageQuery) {
-        Page<UnionTotal> page = unionTotalService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UnionTotal> page = unionTotalService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(UnionTotal::getCountDate));
         return TableDataInfo.build(page);
     }
 
+    @GetMapping("/unionList")
+    public R<List<Union>> unionList() {
+        List<Union> list = unionService.list(Wrappers.<Union>lambdaQuery().last("limit 200"));
+        return R.ok(list);
+    }
+
     @Log(title = "刷新工会每日收益", businessType = BusinessType.DELETE)
     @GetMapping("/refreshData")
     public R<Void> refreshData(String date) {
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/im/ImManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/im/ImManager.java
index 8a5982a5..c8f94970 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/im/ImManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/im/ImManager.java
@@ -110,7 +110,11 @@ public class ImManager {
                     }
                 }
                 String iconSuffix = systemConfigManager.getSystemConfig(SystemConfigEnum.IM_ICON_SUFFIX);
-                uinfoReq.setIcon(icon+iconSuffix);
+                if("none".equalsIgnoreCase(iconSuffix)){
+                    uinfoReq.setIcon(icon);
+                }else{
+                    uinfoReq.setIcon(icon+iconSuffix);
+                }
             }
             if(StringUtils.isNotBlank(nickname)){
                 uinfoReq.setName(nickname);
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
index 52b18fe9..7f5aa6df 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
@@ -66,4 +66,6 @@ public interface UserService extends IService<User> {
     void enSpeckIm(Long userId);
 
     void logout(Long id);
+
+    void refreshImInfo(Long userId);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
index acd5e14f..cd17ddd0 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.cai.service.impl;
 
 import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -473,4 +474,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         LoginHelper.logoutApp(id);
     }
 
+    @Override
+    public void refreshImInfo(Long userId) {
+        User user = this.getById(userId);
+        if(user == null){
+            throw new ServiceException("用户不存在");
+        }
+        imManager.updateImInfo(user.getId(),user.getAvatar(),user.getNickname(),user.getGender());
+    }
+
 }