浏览代码

fix 微信登录

he2802 3 年之前
父节点
当前提交
a9d5780dac

+ 5 - 1
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -286,7 +286,11 @@ public class WxLoginService
 
             userInfo = new String(resultByte, "UTF-8");
             userInfoJSON = JSON.parseObject(userInfo);
-            return String.valueOf(userInfoJSON.get("phoneNumber"));
+            if(userInfoJSON.containsKey("phoneNumber")){
+                return String.valueOf(userInfoJSON.get("phoneNumber"));
+            }else{
+                return null;
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -296,7 +296,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
     @Override
     public List<CourseUserVo> courseList(CourseQueryBo bo) {
-        List<CourseUserVo> courseUserVos = baseMapper.courseList(bo);
+        List<CourseUserVo> courseUserVos = baseMapper.courseList(bo);
         //课程下学员的学习记录
         for (CourseUserVo courseUserVo : courseUserVos) {
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -316,7 +316,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         g.study_start_time,
         g.study_end_time,
         ( SELECT i.business_name FROM course_business i WHERE i.id = g.business_id ) AS business_name,
-        ( SELECT p.project_name FROM course_project_type p WHERE p.id = g.business_id ) AS project_name,
+        ( SELECT p.project_name FROM course_project_type p WHERE p.id = g.project_id ) AS project_name,
         ( SELECT s.school_name FROM school s WHERE s.id = g.school_id ) AS school_name,
         ( SELECT e.education_name FROM course_education_type e WHERE e.id = g.education_type_id ) AS education_name,
         (SELECT COUNT(a.id)+(SELECT COUNT(a.id) FROM goods_attached e LEFT JOIN question_chapter_exam a on e.major_id = a.chapter_exam_id where e.goods_id = g.goods_id and e.type=2)+(SELECT COUNT(h.id) FROM goods_attached e LEFT JOIN question_module_chapter a on e.major_id = a.module_exam_id LEFT JOIN question_chapter_exam h on a.chapter_exam_id = h.chapter_exam_id  where e.goods_id = g.goods_id and e.type=1) FROM goods_attached a where a.goods_id=g.goods_id and a.type = 3) as exam_num,