zhangxin 4 هفته پیش
والد
کامیت
9984de002c

+ 3 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppCoursesMapper.xml

@@ -56,14 +56,15 @@
             a.reminder,
             a.address_site_id,
             a.user_id AS instructorId,
-            d.username AS instructorName,
+            d.realname AS instructorName,
             d.avatar AS instructorAvatar,
             b.longitude,
             b.latitude
         FROM
             nm_courses a
                 LEFT JOIN nm_site b ON a.site_id = b.id
-                LEFT JOIN nm_courses_price_rules c ON a.id = c.courses_id LEFT JOIN sys_user d ON d.id = a.user_id
+                LEFT JOIN nm_courses_price_rules c ON a.id = c.courses_id
+                LEFT JOIN sys_user d ON d.id = a.user_id
         WHERE
             a.STATUS = 0
           AND a.del_flag = 0

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppGameMapper.xml

@@ -251,7 +251,7 @@
         left join sys_depart f on  a.org_code = f.org_code and f.del_flag=0
         WHERE a.del_flag=0 and a.id =#{id}
         GROUP BY  a.id,b.id,c.id
-        ORDER BY a.application_end_time DESC
+        ORDER BY a.application_end_time DESC,c_start_time
         ]]>
     </select>