From c968a009b3083f0cd1666c0935072f97e8f46a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sat, 8 Mar 2025 16:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/flowable/FlowBusinessKeyMapper.xml  | 9 +++++----
 .../main/resources/mapper/manage/WxMenuConfigMapper.xml  | 2 +-
 .../mapper/trouble/SmzSspProblemmodifyMapper.xml         | 2 +-
 yanzhu-ui-app/miniprogram/app.wxss                       | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
index c11cfa0b..3fb9fd05 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
@@ -163,25 +163,26 @@
             <if test="proId != null"> and projectId=#{proId}</if>
             <if test="userId != null"> and lordSent=#{userId} and checkState in (0,3)</if>
         </where>
-        union all
+        UNION ALL
         select '107' as category, id from smz_ssp_problemmodify
         <where>
             infoType=0
             <if test="proId != null"> and projectId=#{proId}</if>
-            <if test="userId != null"> and lordSent=#{userId} and checkState in (0,3)</if>
+            <if test="userId != null"> and recheckSend=#{userId} and checkState=1</if>
         </where>
+        UNION ALL
         select '108' as category, id from smz_ssp_problemmodify
         <where>
             infoType=1
             <if test="proId != null"> and projectId=#{proId}</if>
             <if test="userId != null"> and lordSent=#{userId} and checkState in (0,3)</if>
         </where>
-        union all
+        UNION ALL
         select '109' as category, id from smz_ssp_problemmodify
         <where>
             infoType=1
             <if test="proId != null"> and projectId=#{proId}</if>
-            <if test="userId != null"> and lordSent=#{userId} and checkState in (0,3)</if>
+            <if test="userId != null"> and recheckSend=#{userId} and checkState=1</if>
         </where>
     </select>
 
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml
index e54fdbe5..c6fcb4d8 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join wx_menu_config_role smcr on smcr.smcid = smc.id
         left join sys_user_role ur on ur.role_id = smcr.role_id
         where smc.del_flag = 0
-        and (ur.user_id = #{currentUserId} or smcr.user_id = #{currentUserId})
+        and (ur.user_id = #{currentUserId} or smcr.user_id = #{currentUserId} or smcr.role_id is null)
         <if test="activeProjectId != null"> and smc.project_id = #{activeProjectId}</if>
         <if test="menuType != null and menuType != ''"> and smc.menu_type = #{menuType}</if>
         order by smc.menu_sort asc
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index abd6657c..ab89834e 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test='activeTags == "ywc"'> and ssp.checkState = 4 </if>
             and ssp.isDel = 0
         </where>
-        order by sort, ssp.id desc
+        order by <if test="createBy != null  and createBy != ''">sort,</if> ssp.id desc
     </select>
 
     <select id="selectSmzSspProblemmodifyById" parameterType="Long" resultMap="SmzSspProblemmodifyResult">
diff --git a/yanzhu-ui-app/miniprogram/app.wxss b/yanzhu-ui-app/miniprogram/app.wxss
index e996d8f0..ce79f0e7 100644
--- a/yanzhu-ui-app/miniprogram/app.wxss
+++ b/yanzhu-ui-app/miniprogram/app.wxss
@@ -1898,7 +1898,7 @@ swiper-item video {
 }
 
 .code_label {
-  font-size: 0.9rem;
+  font-size: 0.8rem;
   width: 120rpx;
   margin: auto;
   text-align: center;