|
@@ -268,8 +268,8 @@ public class BizArchiveInputController extends BaseController {
|
|
@Log(title = "合同解除", businessType = BusinessType.UPDATE)
|
|
@Log(title = "合同解除", businessType = BusinessType.UPDATE)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public AjaxResult dissolution(@RequestBody BizArchiveInput bizArchiveInput) {
|
|
public AjaxResult dissolution(@RequestBody BizArchiveInput bizArchiveInput) {
|
|
- boolean b = relieveCheck(bizArchiveInput);
|
|
|
|
- if (!b) {
|
|
|
|
|
|
+ boolean b = relieveCheck(bizArchiveInput );
|
|
|
|
+ if (!b && bizArchiveInput.getServiceType()==1) {
|
|
throw new RuntimeException("解除失败,请先解除最后签约合同");
|
|
throw new RuntimeException("解除失败,请先解除最后签约合同");
|
|
}
|
|
}
|
|
|
|
|
|
@@ -321,7 +321,7 @@ public class BizArchiveInputController extends BaseController {
|
|
.eq(BizWorkOrderRecord::getWorkOrderId, one.getWorkOrderId()));
|
|
.eq(BizWorkOrderRecord::getWorkOrderId, one.getWorkOrderId()));
|
|
if (CollectionUtils.isNotEmpty(list)) {
|
|
if (CollectionUtils.isNotEmpty(list)) {
|
|
detail.setDisabled(true);
|
|
detail.setDisabled(true);
|
|
- } else {
|
|
|
|
|
|
+ } else {
|
|
detail.setDisabled(false);
|
|
detail.setDisabled(false);
|
|
}
|
|
}
|
|
}
|
|
}
|