he2802 пре 2 година
родитељ
комит
010a045d1b

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -514,7 +514,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
             if (maps.containsKey("telphone")) {
                 telphone = JSONObject.parseObject(String.valueOf(maps.get("telphone")), UserProfileFit.class).getValue();
                 if(Validator.isNotEmpty(telphone)){
-                    if(Validator.isNotEmpty(user)&&Validator.isEmpty(user.getTelphone())){ //身份证为空是覆盖
+                    if(Validator.isNotEmpty(user)&&Validator.isEmpty(user.getTelphone())){ //手机号码为空是覆盖
                         User user2 = iUserService.getOne(new LambdaQueryWrapper<User>()
                                 .eq(User::getTelphone, EncryptHandler.encrypt(telphone)).last("limit 1"));
                         if(Validator.isNotEmpty(user2)){

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

@@ -54,7 +54,16 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
         if (Validator.isEmpty(courseBusinessVos)||courseBusinessVos.size()<1){
             throw new IllegalArgumentException("请输入正确业务ID");
         }
-        return BeanUtil.toBean(courseBusinessVos.get(0), CourseBusinessVo.class);
+        CourseBusinessVo vo = courseBusinessVos.get(0);
+        CourseBusinessQueryBo queryBo = new CourseBusinessQueryBo();
+        queryBo.setId(id);
+        String fullName = queryFullName(queryBo);
+        if(Validator.isNotEmpty(fullName)){
+            if(fullName.equals("继续教育二级建造师")||fullName.equals("继续教育二级造价师")){
+                vo.setGoodsLearningOrder(2);
+            }
+        }
+        return BeanUtil.toBean(vo, CourseBusinessVo.class);
     }
 
     @Override

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -639,6 +639,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
      */
     @Override
     public List<ClassPeriodVo> menuAllList(UserStudyRecordQueryBo bo) {
+        if(Validator.isEmpty(bo.getCourseId())){
+            throw new CustomException("参数缺失");
+        }
         //存储整个目录节列表
         List<ClassPeriodVo> sectionList = new ArrayList<>();
         //获取课程目录
@@ -701,6 +704,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
     @Override
     public List<ClassPeriodVo> menuAllListWithExam(UserStudyRecordQueryBo bo) {
+        if(Validator.isEmpty(bo.getCourseId())){
+            throw new CustomException("参数缺失");
+        }
         //存储整个目录节列表
         List<ClassPeriodVo> sectionList = new ArrayList<>();
         //获取课程目录