merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -470,6 +470,19 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 goodsVo.setMaxPrice(collect.get(collect.size() - 1).getStandPrice());
             }
         }
+        CourseBusinessQueryBo queryBo = new CourseBusinessQueryBo();
+        queryBo.setId(goodsVo.getBusinessId());
+        String fullName = iCourseBusinessService.queryFullName(queryBo);
+        goodsVo.setErJianErZao(false);
+        goodsVo.setJjShiGongYuan(false);
+        if(Validator.isNotEmpty(fullName)){
+            if(fullName.equals("继续教育二级建造师")||fullName.equals("继续教育二级造价师")){
+                goodsVo.setErJianErZao(true);
+            }
+            if(fullName.contains("继续教育")&&fullName.contains("施工现场专业人员")){
+                goodsVo.setJjShiGongYuan(true);
+            }
+        }
         return goodsVo;
     }
 

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

@@ -1110,6 +1110,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             String respone = "";
             log.info("学时信息推送参数"+ dataTxt);
             respone = HttpUtils.postFormBody(OFFICIALPUSH_PERIODPATH, params);
+            if (Validator.isEmpty(respone)) {
+                return "响应信息空";
+            }
             log.info("学时信息推送参数结果"+ respone);
             String[] split = respone.split("\\|");
             if (split.length < 2) {
@@ -1225,6 +1228,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             String respone = "";
             log.info("学时信息推送参数"+ dataTxt);
             respone = HttpUtils.postFormBody(OFFICIALPUSH_SEVEN_PERIODPATH, params);
+            if (Validator.isEmpty(respone)) {
+                return "响应信息空";
+            }
             log.info("学时信息推送参数结果"+ respone);
             if(Validator.isEmpty(respone)){
                 return null;