sczx_group/sczx_web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oss上传，手动结束订单待完善，数据权限优化调整

Browse Source
This commit is contained in:
19173159168
2025-08-10 12:41:27 +08:00
parent c463bdabb3
commit 48f0589e1a
25 changed files with 389 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml
View File

@ -42,19 +42,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, user_name, avatar_url, password, phone_number, role_id, is_store, nick_name, wechat_openid, alipay_userid, del_flag, create_time, update_time from zc_base_user
</sql>
<select id="selectZcBaseUserList" parameterType="ZcBaseUser" resultMap="ZcBaseUserResult">
<include refid="selectZcBaseUserVo"/>
<select id="selectZcBaseUserList" parameterType="ZcBaseUser" resultMap="ZcBaseUserZcBaseUserStoreResult">
select a.id, a.user_name, a.avatar_url, a.password, a.phone_number, a.role_id, a.is_store, a.nick_name, a.wechat_openid, a.alipay_userid, a.del_flag, a.create_time, a.update_time,
b.id as sub_id, b.user_id as sub_user_id, b.operator_id as sub_operator_id, b.store_id as sub_store_id, b.create_time as sub_create_time
from zc_base_user a
left join zc_base_user_store b on b.user_id = a.id
<where>
del_flag = '0'
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
<if test="avatarUrl != null and avatarUrl != ''"> and avatar_url = #{avatarUrl}</if>
<if test="password != null and password != ''"> and password = #{password}</if>
<if test="phoneNumber != null and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
<if test="roleId != null "> and role_id = #{roleId}</if>
<if test="isStore != null "> and is_store = #{isStore}</if>
<if test="nickName != null and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
<if test="wechatOpenid != null and wechatOpenid != ''"> and wechat_openid = #{wechatOpenid}</if>
<if test="alipayUserid != null and alipayUserid != ''"> and alipay_userid = #{alipayUserid}</if>
a.del_flag = '0'
<if test="userName != null and userName != ''"> and a.user_name like concat('%', #{userName}, '%')</if>
<if test="avatarUrl != null and avatarUrl != ''"> and a.avatar_url = #{avatarUrl}</if>
<if test="password != null and password != ''"> and a.password = #{password}</if>
<if test="phoneNumber != null and phoneNumber != ''"> and a.phone_number = #{phoneNumber}</if>
<if test="roleId != null "> and a.role_id = #{roleId}</if>
<if test="isStore != null "> and a.is_store = #{isStore}</if>
<if test="nickName != null and nickName != ''"> and a.nick_name like concat('%', #{nickName}, '%')</if>
<if test="wechatOpenid != null and wechatOpenid != ''"> and a.wechat_openid = #{wechatOpenid}</if>
<if test="alipayUserid != null and alipayUserid != ''"> and a.alipay_userid = #{alipayUserid}</if>
<if test="storeId != null "> and b.store_id = #{storeId}</if>
<if test="operatorId != null "> and b.operator_id = #{operatorId}</if>
</where>
</select>
@ -63,7 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.id as sub_id, b.user_id as sub_user_id, b.operator_id as sub_operator_id, b.store_id as sub_store_id, b.create_time as sub_create_time
from zc_base_user a
left join zc_base_user_store b on b.user_id = a.id
where a.del_flag = '0' and b.store_id = #{storeId}
where a.del_flag = '0'
<if test="storeId != null "> and b.store_id = #{storeId}</if>
<if test="operatorId != null "> and b.operator_id = #{operatorId}</if>
</select>
<select id="selectZcBaseUserById" parameterType="Long" resultMap="ZcBaseUserZcBaseUserStoreResult">

1
ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml
View File

@ -104,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="storeName != null and storeName!= '' "> and s.name = #{storeName}</if>
<if test="licensePlate != null and licensePlate!= '' "> and zc.license_plate = #{licensePlate}</if>
</where>
order by a.update_time desc
</select>
<select id="selectZcOrderMainByOrderId" parameterType="Long" resultMap="ZcOrderMainZcOrderSubResult">