|
@@ -298,7 +298,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
|
|
.atZone(ZoneId.systemDefault()).toLocalDate();
|
|
.atZone(ZoneId.systemDefault()).toLocalDate();
|
|
expenseSheet.setCreateDate(localDate);
|
|
expenseSheet.setCreateDate(localDate);
|
|
Optional<User> first;
|
|
Optional<User> first;
|
|
- if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
|
|
|
+ if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()!=1){
|
|
first = userList.stream().filter(us -> us.getName().equals(reimburserCell.getStringCellValue())).findFirst();
|
|
first = userList.stream().filter(us -> us.getName().equals(reimburserCell.getStringCellValue())).findFirst();
|
|
}else {
|
|
}else {
|
|
first = userList.stream().filter(us -> us.getName().equals(reimburserCell.getStringCellValue())||(us.getJobNumber()!=null&&us.getJobNumber().equals(reimburserCell.getStringCellValue()))).findFirst();
|
|
first = userList.stream().filter(us -> us.getName().equals(reimburserCell.getStringCellValue())||(us.getJobNumber()!=null&&us.getJobNumber().equals(reimburserCell.getStringCellValue()))).findFirst();
|