Merge remote-tracking branch 'origin/master'

twzd-admin/src/main/java/com/miaxis/app/controller/h5/ScoreInfoController.java

@@ -18,7 +18,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -47,7 +46,6 @@ public class ScoreInfoController extends BaseController {
         startPage();
         ScoreInfo scoreInfo = new ScoreInfo();
         scoreInfo.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
-        System.out.println();
         List<ScoreInfo> list = scoreInfoService.selectScoreInfoList(scoreInfo);
         return toResponsePageInfo(list);
     }

twzd-admin/src/main/java/com/miaxis/pc/controller/question/PcScoreInfoController.java

@@ -94,7 +94,7 @@ public class PcScoreInfoController extends BaseController {
     })
     public ResponsePageInfo<ScoreInfo> studentscore( @PathVariable("userId") Long userId){
         startPage();
-        List<ScoreInfo> list = scoreInfoService.list(new QueryWrapper<ScoreInfo>().eq("user_id",userId));
+        List<ScoreInfo> list = scoreInfoService.list(new QueryWrapper<ScoreInfo>().eq("user_id",userId).orderByDesc("create_time"));
         return toResponsePageInfo(list);
     }
 

twzd-service/src/main/resources/mapper/score/ScoreInfoMapper.xml

@@ -40,7 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kskm != null  and kskm != ''"> and kskm = #{kskm}</if>
             <if test="score != null "> and score = #{score}</if>
         </where>
-        order by create_time desc
     </select>
 
 

twzd-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="getStudentByOpenId" parameterType="String" resultType="com.miaxis.common.core.domain.entity.UserInfo">
 		select * from user_info
-		where open_id = #{openId}
+		where openid = #{openId}
 	</select>
 
 	<select id="getStudentByUnionid" parameterType="String" resultType="com.miaxis.common.core.domain.entity.UserInfo">