Merge branch 'fu-dev' of uskycloud/usky-cloud into master

base-modules/service-file/pom.xml

@@ -104,6 +104,10 @@
                         <goals>
                             <goal>repackage</goal>
                         </goals>
+                        <configuration>
+                            <!-- 新增：给启动包加后缀，保留原始普通jar用于依赖，解决外部引用报错问题-->
+                            <classifier>exec</classifier>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -122,6 +126,7 @@
                     <!--                    </excludes>-->
                 </configuration>
             </plugin>
+
         </plugins>
     </build>
 

base-modules/service-file/src/main/java/com/ruoyi/file/mapper/FilesMapper.java

@@ -3,8 +3,9 @@ package com.ruoyi.file.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.file.domain.FilesUpload;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
-@Mapper
+@Repository
 public interface FilesMapper extends BaseMapper<FilesUpload> {
 
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceReceiveServiceImpl.java

@@ -338,6 +338,13 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
         JSONObject appMode = JSONObject.parseObject(setting.getAppMode());
         JSONObject wcMode = JSONObject.parseObject(setting.getWcMode());
 
+        // 保存消息内容
+        Integer contentId = saveMessageContent(mceRequestVO, userIdToUserMap);
+        if (contentId == null) {
+            log.error("消息内容保存失败，用户: {}", mceRequestVO.getUserName());
+            return;
+        }
+
         // 处理每个目标用户的消息接收和发送
         for (Long userId : validUserIds) {
             SysUser user = userIdToUserMap.get(userId);
@@ -357,13 +364,6 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
                 return;
             }
 
-            // 保存消息内容
-            Integer contentId = saveMessageContent(mceRequestVO, userIdToUserMap);
-            if (contentId == null) {
-                log.error("消息内容保存失败，用户: {}", mceRequestVO.getUserName());
-                return;
-            }
-
             // 创建消息接收记录
             MceReceive mceReceive = createMceReceive(user, contentId, mceRequestVO, userNameToNickNameMap);
             boolean saveResult = this.save(mceReceive);

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -68,7 +68,7 @@
             </if>
             AND FIND_IN_SET(#{deptId}, dept_id) > 0
         </where>
-        order by notice_id desc
+        order by create_time desc
     </select>
 
     <insert id="insertNotice" useGeneratedKeys="true" keyProperty="noticeId"