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 @@
and projectId=#{proId} and lordSent=#{userId} and checkState in (0,3)
- union all
+ UNION ALL
select '107' as category, id from smz_ssp_problemmodify
infoType=0
and projectId=#{proId}
- and lordSent=#{userId} and checkState in (0,3)
+ and recheckSend=#{userId} and checkState=1
+ UNION ALL
select '108' as category, id from smz_ssp_problemmodify
infoType=1
and projectId=#{proId} and lordSent=#{userId} and checkState in (0,3)
- union all
+ UNION ALL
select '109' as category, id from smz_ssp_problemmodify
infoType=1
and projectId=#{proId}
- and lordSent=#{userId} and checkState in (0,3)
+ and recheckSend=#{userId} and checkState=1
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)
and smc.project_id = #{activeProjectId} and smc.menu_type = #{menuType}
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"
and ssp.checkState = 4
and ssp.isDel = 0
- order by sort, ssp.id desc
+ order by sort, ssp.id desc