wyh
/
gan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wyh:442a8fa18164c5e063c50c99c30de75a39069359
Branches Tags
wyh:main
..
compare: wyh:f4a6c1988991fae8d892eb5fbde8689bf806be51
Branches Tags
wyh:main

No commits in common. "442a8fa18164c5e063c50c99c30de75a39069359" and "f4a6c1988991fae8d892eb5fbde8689bf806be51" have entirely different histories.
442a8fa181 ... f4a6c19889

4 changed files with 8 additions and 10 deletions
Show Stats Expand all files Collapse all files

1
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
View File

@ -143,6 +143,7 @@ public class AppLoginController {
break;
}
} else {
log.info("其他学校：----------" + register.getInvitationCode());
if ("其他".equals(appSchool.getName()) && org.apache.commons.lang3.StringUtils.isNotBlank(registerForm.getInvitationCode())) {
AppCode appCode = appCodeMapper.selectAppCodeByCode(registerForm.getInvitationCode());
if (appCode == null || appCode.getUserId() != null) {

5
gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppCodeMapper.xml
View File

@ -25,13 +25,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from app_code a
left join app_user u on u.id = a.user_id
<where>
<if test="code != null and code != ''"> and a.code like concat('%',#{code},'%')</if>
<if test="code != null and code != ''"> and a.code = #{code}</if>
<if test="userId != null "> and a.user_id = #{userId}</if>
<if test="userName != null "> and u.username like concat('%',#{userName},'%')</if>
<if test="updateBy != null and updateBy != ''"> and a.updateBy = #{updateBy}</if>
<if test="userTime != null "> and a.user_time = #{userTime}</if>
</where>
order by a.create_time desc
</select>
<select id="selectAppCodeById" parameterType="Long" resultMap="AppCodeResult">
@ -39,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<select id="selectAppCodeByCode" parameterType="java.lang.String" resultMap="AppCodeResult">
<select id="selectAppCodeByCode" parameterType="Long" resultMap="AppCodeResult">
<include refid="selectAppCodeVo"/>
where code = #{code}
limit 1

11
gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppExchangeCodeMapper.xml
View File

@ -26,13 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from app_exchange_code e left join app_user u on u.id = e.user_id
<where>
<if test="code != null and code != ''"> and e.code like concat('%',#{code},'%')</if>
<if test="userId != null "> and e.user_id = #{userId}</if>
<if test="level != null "> and e.level = #{level}</if>
<if test="updateBy != null and updateBy != ''"> and e.updateBy = #{updateBy}</if>
<if test="userTime != null "> and DATE_FORMAT(e.user_time,'%Y-%m-%d') = DATE_FORMAT(#{userTime},'%Y-%m-%d') </if>
<if test="code != null and code != ''"> and code = #{code}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="level != null "> and level = #{level}</if>
<if test="updateBy != null and updateBy != ''"> and updateBy = #{updateBy}</if>
<if test="userTime != null "> and DATE_FORMAT(user_time,'%Y-%m-%d') = DATE_FORMAT(#{userTime},'%Y-%m-%d') </if>
</where>
order by e.create_time desc
</select>
<select id="selectAppExchangeCodeById" parameterType="Long" resultMap="AppExchangeCodeResult">

1
gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppInformMapper.xml
View File

@ -46,7 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="byUserId != null "> and a.by_user_id = #{byUserId}</if>
<if test="content != null and content != ''"> and a.content like concat('%',#{content},'%')</if>
</where>
order by a.create_time desc
</select>
<select id="selectAppInformById" parameterType="Long" resultMap="AppInformResult">