#287 修复切换租户后分配角色后菜单接口数据异常问题

Cerrada
fuyuchuan desea fusionar 3 commits de uskycloud/fu-dev en uskycloud/master

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

+ 1 - 1
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"