|
@@ -235,7 +235,10 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
//处理订单
|
|
//处理订单
|
|
|
departmentMapper.updateOrderDepFinanceNotExamine(in.getFinanceId(),useDep.getFinanceId());
|
|
departmentMapper.updateOrderDepFinanceNotExamine(in.getFinanceId(),useDep.getFinanceId());
|
|
|
List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getFinanceId());
|
|
List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getFinanceId());
|
|
|
- torderNewMapper.updateOrderDepFinanceExamineName(list);
|
|
|
|
|
|
|
+ if (!list.isEmpty()){
|
|
|
|
|
+ torderNewMapper.updateOrderDepFinanceExamineName(list);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
updateFinance=true;
|
|
updateFinance=true;
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(in.getRetrialFinanceId())&&
|
|
if (StringUtils.isNotBlank(in.getRetrialFinanceId())&&
|
|
@@ -243,7 +246,9 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
dep.setRetrialFinanceId(in.getRetrialFinanceId());
|
|
dep.setRetrialFinanceId(in.getRetrialFinanceId());
|
|
|
departmentMapper.updateOrderDepFinanceNotExamine(in.getRetrialFinanceId(),useDep.getRetrialFinanceId());
|
|
departmentMapper.updateOrderDepFinanceNotExamine(in.getRetrialFinanceId(),useDep.getRetrialFinanceId());
|
|
|
List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getRetrialFinanceId());
|
|
List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getRetrialFinanceId());
|
|
|
- torderNewMapper.updateOrderDepFinanceExamineName(list);
|
|
|
|
|
|
|
+ if (!list.isEmpty()){
|
|
|
|
|
+ torderNewMapper.updateOrderDepFinanceExamineName(list);
|
|
|
|
|
+ }
|
|
|
updateRetrialFinance=true;
|
|
updateRetrialFinance=true;
|
|
|
}
|
|
}
|
|
|
dep.setExpenseFinanceId(in.getExpenseFinanceId());
|
|
dep.setExpenseFinanceId(in.getExpenseFinanceId());
|