审批修改

src/manager/cn/com/yskj/zfdm/manager/service/application/ServiceRequestInquiryManagerImpl.java

@@ -31,7 +31,6 @@ import cn.com.yskj.zfdm.manager.comm.handler.hlt.service.HltService;
 import cn.com.yskj.zfdm.repo.request.service.application.ServiceRequestManagementRequest;
 import cn.com.yskj.zfdm.repo.zfd.ZfdServiceApplyDetailRepo;
 import cn.com.yskj.zfdm.repo.zfd.ZfdServiceApplyRepo;
-import cn.hutool.core.collection.CollectionUtil;
 @Service
 public class ServiceRequestInquiryManagerImpl extends AbstractManager implements ServiceRequestInquiryManager{
 
@@ -80,7 +79,7 @@ public class ServiceRequestInquiryManagerImpl extends AbstractManager implements
 		if(zfdServiceApply.getStatus() == ApprovalType.PASSED){
 		    //审批不通过原因不能填写
 			if(StringTools.hasText(zfdServiceApply.getReasonForFailure())) throw new MyViolationException("reasonForFailure", "审批通过请不要填写不通过原因");
-			if (ServiceApplicationManagementStatus.GAS_COUPON == zfdServiceApply.getServiceType()) {
+			if (ServiceApplicationManagementStatus.GAS_COUPON == applyInDb.getServiceType()) {
 				// 只有服务类型为加油券的服务申请,才有服务申请详情.
 				applyDetailList = zfdServiceApplyDetailRepo.findByApplyId(applyInDb.getId());
 				if(applyDetailList==null || applyDetailList.size()==0) throw new ManagerException("未找到该申请的详情，申请编号："+ zfdServiceApply.getId());
@@ -108,9 +107,12 @@ public class ServiceRequestInquiryManagerImpl extends AbstractManager implements
 	
 		//保存数据
 		zfdServiceApplyRepo.save(applyInDb);
-		if (!CollectionUtil.isEmpty(applyDetailList)) {
+		if (applyDetailList !=null) {
 			zfdServiceApplyDetailRepo.saveAll(applyDetailList);
 		}
+//		if (!CollectionUtil.isEmpty(applyDetailList)) {
+//			zfdServiceApplyDetailRepo.saveAll(applyDetailList);
+//		}
 	}
 
 	private void rechargeOrderCommRequest(List<ZfdServiceApplyDetail> applyDetailList, String rechargeOrderId)