Merge branch 'master' of 49.232.152.146:qangqi/dd_school

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationMemberController.java

@@ -38,7 +38,7 @@ import java.util.List;
 
 /**
  * 社团成员Controller
- * 
+ *
  * @author liul
  * @date 2023-09-06
  */
@@ -83,11 +83,13 @@ public class SchoolOrganizationMemberController extends BaseController
                 wrapper1.eq(SchoolStudentClassRelation::getStudentId,userId);
                 SchoolStudentClassRelation one = schoolStudentClassRelationService.getOne(wrapper1);
 
-                LambdaQueryWrapper<SchoolClass> wrapper2 = Wrappers.lambdaQuery();
-                wrapper2.eq(SchoolClass::getId,one.getClassId());
-                SchoolClass res = schoolClassService.getOne(wrapper2);
-                list.get(i).setGrade(res.getGradeName());
-                list.get(i).setClasses(res.getClassName());
+                if(StringUtils.isNotNull(one)){
+                    LambdaQueryWrapper<SchoolClass> wrapper2 = Wrappers.lambdaQuery();
+                    wrapper2.eq(SchoolClass::getId,one.getClassId());
+                    SchoolClass res = schoolClassService.getOne(wrapper2);
+                    list.get(i).setGrade(res.getGradeName());
+                    list.get(i).setClasses(res.getClassName());
+                }
             }
         }
         return getDataTable(list);

smart-campus/src/main/resources/mapper/schoolRewardsPunishments/SchoolScAwardsMapper.xml

@@ -67,6 +67,7 @@
             <if test="applyId != null "> and apply_id = #{applyId}</if>
             <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(awards_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
         </where>
+        order by create_time DESC
     </select>
 
     <select id="selectSchoolScAwardsListTg" parameterType="SchoolScAwardsVo" resultMap="SchoolScAwardsVoResult">
@@ -86,6 +87,7 @@
             <if test="applyId != null "> and apply_id = #{applyId}</if>
             <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(awards_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
         </where>
+        order by create_time DESC
     </select>
 
     <select id="selectSchoolScAwardsById" parameterType="Long" resultMap="SchoolScAwardsSchoolAccessoryResult">