Przeglądaj źródła

Merge branch 'test2' into test

anderx 1 rok temu
rodzic
commit
738e14f094

+ 7 - 2
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

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