jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-03-08 16:54:22 +08:00
parent f598a52789
commit c968a009b3
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
View File

@ -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>

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml
View File

@ -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

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
View File

@ -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">

2
yanzhu-ui-app/miniprogram/app.wxss
View File

@ -1898,7 +1898,7 @@ swiper-item video {
}
.code_label {
font-size: 0.9rem;
font-size: 0.8rem;
width: 120rpx;
margin: auto;
text-align: center;