|
|
@@ -66,7 +66,7 @@ public class RateService {
|
|
|
Rate orig = rateRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
|
|
|
boolean examination = orig.isUndertakeExamination();
|
|
|
ObjUtils.merge(orig, record);
|
|
|
-
|
|
|
+// if (ObjectUtil.isNotNull(record.getStatus())) {
|
|
|
switch (record.getStatus()) {
|
|
|
case FIRST_REVIEW_PENDING: // 初审中 1
|
|
|
orig.setApplyTime(now);
|
|
|
@@ -100,6 +100,7 @@ public class RateService {
|
|
|
break;
|
|
|
}
|
|
|
orig.setSort(orig.getStatus().getSort());
|
|
|
+// }
|
|
|
return rateRepo.save(orig);
|
|
|
|
|
|
}
|
|
|
@@ -472,7 +473,8 @@ public class RateService {
|
|
|
.stream()
|
|
|
.collect(Collectors.toMap(User::getId, user -> user));
|
|
|
if (!rate.isChange()) {
|
|
|
- Organization organization = organizationRepo.findById(rate.getId()).orElseThrow(new BusinessException("无记录"));
|
|
|
+ Organization organization = organizationRepo.findById(rate.getId())
|
|
|
+ .orElseThrow(new BusinessException("无记录"));
|
|
|
rate.setAddress(organization.getAddress());
|
|
|
}
|
|
|
|