czg_team
/
newadmin
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改创客逻辑

This commit is contained in:
韩鹏辉 2023-08-01 14:37:06 +08:00
parent 83c984dcfd
commit edafbe0ba2
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java
View File

@ -48,7 +48,6 @@ public class Userservice {
TbPlussMerchantBaseInfoMapper baseInfoMapper; TbPlussMerchantBaseInfoMapper baseInfoMapper;
public RespBody doLogin(String loginName,String password,String userType,String ip) throws Exception { public RespBody doLogin(String loginName,String password,String userType,String ip) throws Exception {
Boolean flag=false; Boolean flag=false;
if("FO".equals(userType)||"SO".equals(userType)||"MG".equals(userType)){ if("FO".equals(userType)||"SO".equals(userType)||"MG".equals(userType)){
flag=true; flag=true;

20
newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml
View File

@ -265,14 +265,18 @@
<select id="selectMarkByUserId" resultType="java.util.Map"> <select id="selectMarkByUserId" resultType="java.util.Map">
SELECT SELECT
m.user_id as userId, m.user_id AS userId,
m.`name`, m.`name`,
m.phone, m.phone,
m.`status`, m.`status`,
m.remark, m.remark,
m.create_time as createTime, m.create_time AS createTime,
m.update_time as updateTime m.update_time AS updateTime
FROM
tb_pluss_user_marker m
LEFT JOIN (
SELECT
p.user_id
FROM FROM
( (
SELECT SELECT
@ -285,10 +289,12 @@
WHERE WHERE
@ids IS NOT NULL @ids IS NOT NULL
) ID, ) ID,
tb_pluss_user_promotion p right join tb_pluss_user_maker m on p.user_id=m.user_id tb_pluss_user_promotion p
WHERE WHERE
FIND_IN_SET( p.user_id, ID._ids ) p.type_code = 'MC'
and p.type_code='MC' AND FIND_IN_SET( p.user_id, ID._ids )
) d ON m.user_id = d.user_id
where 1=1
<if test="phone !=null and phone !=''"> <if test="phone !=null and phone !=''">
and m.phone=#{phone} and m.phone=#{phone}
</if> </if>