|
@@ -113,6 +113,9 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
|
|
|
if(incrementOrderMg != null && incrementOrderMg2 != null && incrementOrderMg.getId() < incrementOrderMg2.getId()){
|
|
|
incrementOrderMg = incrementOrderMg2;
|
|
|
}
|
|
|
+ if(incrementOrderMg == null){
|
|
|
+ incrementOrderMg = incrementOrderMg2;
|
|
|
+ }
|
|
|
if(incrementOrderMg != null){
|
|
|
vo.setCustomerName(incrementOrderMg.getCustomerName());
|
|
|
vo.setCustomerType(incrementOrderMg.getCustomerType());
|