Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 1f0ed440 by 丁伟峰
Options

Merge branch 'feature-dingwf-0715' into develop

2 parents 8010a744 aeb73a76
Inline Side-by-side
Showing with 1 additions and 1 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
......@@ -66,7 +66,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
private List<EngineerCalendarDTO.Calendar> getOneEngineerCalendars(String engineerCode, String bdate, String edate) {
// 返回某一个技术员，日期范围内的日历列表
List<EngineerCalendarDTO.Calendar> calendars = null;
List<EngineerCalendarDTO.Calendar> calendars = new ArrayList<>();
List<String> teamIds = orgTeamEngineerDao.getTeamIdsByEngineerCode(engineerCode);
if (teamIds == null || teamIds.size() == 0) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!