Merge branch 'main' of https://git.mowei.com.cn/wyh/gan into main

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

@@ -143,7 +143,6 @@ 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) {

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

@@ -25,12 +25,13 @@ 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 = #{code}</if>
+            <if test="code != null  and code != ''"> and a.code like concat('%',#{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">
@@ -38,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <select id="selectAppCodeByCode" parameterType="Long" resultMap="AppCodeResult">
+    <select id="selectAppCodeByCode" parameterType="java.lang.String" resultMap="AppCodeResult">
         <include refid="selectAppCodeVo"/>
         where code = #{code}
         limit 1

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

@@ -26,12 +26,13 @@ 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 code = #{code}</if>
+            <if test="code != null  and code != ''"> and e.code like concat('%',#{code},'%')</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userId != null "> and e.user_id = #{userId}</if>
-            <if test="level != null "> and level = #{level}</if>
+            <if test="level != null "> and e.level = #{level}</if>
-            <if test="updateBy != null  and updateBy != ''"> and updateBy = #{updateBy}</if>
+            <if test="updateBy != null  and updateBy != ''"> and e.updateBy = #{updateBy}</if>
-            <if test="userTime != null "> and DATE_FORMAT(user_time,'%Y-%m-%d')  = DATE_FORMAT(#{userTime},'%Y-%m-%d') </if>
+            <if test="userTime != null "> and DATE_FORMAT(e.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">

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

@@ -46,6 +46,7 @@ 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">