submit

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -2104,8 +2104,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             item.setUserId(user.getUserId());
             //查询购买课程
             UserBusinessGoodsVo goodsVo = baseMapper.getCourseByUser(item);
-            goodsVo.setIdNum(item.getIdNum());
-            goodsBoList.add(goodsVo);
+            if (ObjectUtils.isNotNull(goodsVo)){
+                goodsVo.setIdNum(item.getIdNum());
+                goodsBoList.add(goodsVo);
+            }
         }
         return goodsBoList;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -354,13 +354,12 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                             }
                         });
                     }
-                    if (StringUtils.isNotBlank(bo.getOfficialName()) && ObjectUtils.isNotNull(bo.getClassStatus()) && bo.getClassStatus() == 1){
-                        add.setSevenCode(ServletUtils.getEncoded("SEV"));
-                    }else {
-                        String sevenCode = getSevenCode(goodsId,add.getStudentUpper());
-                        add.setSevenCode(sevenCode);
-                    }
-
+                if (StringUtils.isNotBlank(bo.getOfficialName()) && ObjectUtils.isNotNull(bo.getClassStatus()) && bo.getClassStatus() == 1){
+                    add.setSevenCode(ServletUtils.getEncoded("SEV"));
+                }else {
+                    String sevenCode = getSevenCode(goodsId,add.getStudentUpper());
+                    add.setSevenCode(sevenCode);
+                }
             }
             else if (("继续教育二级建造师".equals(businessName)|| ("继续教育二级造价师".equals(businessName))) && sysTenant.getShareClass() == 1){
                 erJfalg = true;