|
|
@@ -421,20 +421,22 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
|
|
|
String userId = requestMap.get("user_id");
|
|
|
String hwRequirementId = requestMap.get("hwRequirementId"); //需求主键id
|
|
|
HwRequirementAPI hwRequirementAPI = this.getRequirementById(hwRequirementId);
|
|
|
- HwEnrollment hwEnrollment = new HwEnrollment();
|
|
|
- hwEnrollment.setUserId(Integer.parseInt(userId));
|
|
|
- hwEnrollment.setRequirementId(Integer.parseInt(hwRequirementId));
|
|
|
- List<HwEnrollment> hwEnrollmentList = hwEnrollmentService.findHwEnrollmentList(hwEnrollment);
|
|
|
- if (hwEnrollmentList.size() > 0) {
|
|
|
- returnMap.put("needEnrollment", false);
|
|
|
- List<HwOrder> hwOrderList = hwOrderService.findHwOrderByEnrollId(String.valueOf(hwEnrollmentList.get(0).getId()));
|
|
|
- if(hwOrderList.size()>0){
|
|
|
- returnMap.put("displayCancel", false);
|
|
|
- }else{
|
|
|
- returnMap.put("displayCancel", true);
|
|
|
+ if(StringUtils.isNotBlank(userId)){
|
|
|
+ HwEnrollment hwEnrollment = new HwEnrollment();
|
|
|
+ hwEnrollment.setUserId(Integer.parseInt(userId));
|
|
|
+ hwEnrollment.setRequirementId(Integer.parseInt(hwRequirementId));
|
|
|
+ List<HwEnrollment> hwEnrollmentList = hwEnrollmentService.findHwEnrollmentList(hwEnrollment);
|
|
|
+ if (hwEnrollmentList.size() > 0) {
|
|
|
+ returnMap.put("needEnrollment", false);
|
|
|
+ List<HwOrder> hwOrderList = hwOrderService.findHwOrderByEnrollId(String.valueOf(hwEnrollmentList.get(0).getId()));
|
|
|
+ if(hwOrderList.size()>0){
|
|
|
+ returnMap.put("displayCancel", false);
|
|
|
+ }else{
|
|
|
+ returnMap.put("displayCancel", true);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ returnMap.put("needEnrollment", true);
|
|
|
}
|
|
|
- } else {
|
|
|
- returnMap.put("needEnrollment", true);
|
|
|
}
|
|
|
returnMap.put("hwRequirementAPI", hwRequirementAPI);
|
|
|
return returnMap;
|