|
@@ -193,6 +193,9 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
|
|
|
@Override
|
|
|
public AccountRunningWaterVo detail(Long id) {
|
|
|
AccountRunningWaterVo result = baseMapper.getDetail(id);
|
|
|
+ if (ObjectUtil.isEmpty(result)) {
|
|
|
+ return result;
|
|
|
+ }
|
|
|
|
|
|
Corporation corporation = corporationService.getById(result.getCorporationId());
|
|
|
if (ObjectUtil.isNotEmpty(corporation)) {
|
|
@@ -313,6 +316,10 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
|
|
|
AccountRunningWater accountRunningWater = getById(id);
|
|
|
Assert.notEmpty(accountRunningWater, "获取不到该流水信息");
|
|
|
|
|
|
+ if (!Objects.equals(accountRunningWater.getIsClaim(), 0)) {
|
|
|
+ throw new ServiceException("该流水已被认领,请取消认领后再操作!!!");
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
String status = "10".equals(accountRunningWater.getStatus()) ? "20" : "10";
|
|
|
accountRunningWater.setStatus(status);
|