Merge branch 'master' of 49.232.152.146:qangqi/dd_school

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

@@ -83,6 +83,7 @@ public class SchoolOrganizationMemberController extends BaseController
                 wrapper1.eq(SchoolStudentClassRelation::getStudentId,userId);
                 SchoolStudentClassRelation one = schoolStudentClassRelationService.getOne(wrapper1);
 
+                if(StringUtils.isNotNull(one)){
                     LambdaQueryWrapper<SchoolClass> wrapper2 = Wrappers.lambdaQuery();
                     wrapper2.eq(SchoolClass::getId,one.getClassId());
                     SchoolClass res = schoolClassService.getOne(wrapper2);
@@ -90,6 +91,7 @@ public class SchoolOrganizationMemberController extends BaseController
                     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">