suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20240606_lastFix' into 'master'

Browse Source 
last_time

See merge request hangzhou/java/custom_xfsg!15
This commit is contained in:
zhangchenbiao
2024-06-06 06:32:01 +00:00
parent f46f62a3a5 56cfad85b8
commit d6364f1754
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
View File

@@ -163,10 +163,10 @@ public class FirstOrderServiceImp implements FirstOrderService {
} }
}else { }else {
order = new FirstOrderDTO(); order = new FirstOrderDTO();
if (Objects.nonNull(shopInfo.getSupervisorUserId())){ }
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); if (Objects.nonNull(shopInfo.getSupervisorUserId())){
order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber()); EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId());
} order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
} }
return order; return order;
} }