Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into dev

youxiw2000
2 parents fcbaeea3 1b3dfb3f
Showing 4 changed files with 4 additions and 0 deletions
trash-workFlow/src/main/java/com/trash/office/service/impl/ConferenceServiceImpl.java
trash-workFlow/src/main/java/com/trash/office/service/impl/HandleAffairsServiceImpl.java
trash-workFlow/src/main/java/com/trash/office/service/impl/LeaveApplicationServiceImpl.java
trash-workFlow/src/main/java/com/trash/office/service/impl/LogisticsManagementServiceImpl.java
@@ -226,6 +226,7 @@ public class ConferenceServiceImpl implements IConferenceService {
         workflow.setId("conference:" + conference.getId().toString());
         workflow.setState("0");
         workflow.setCreateBy(SecurityUtils.getUsername());
+        workflow.setCreateName(SecurityUtils.getUsername());
         workflow.setCreateTime(DateUtils.getNowDate());
         workflow.setTitle(conference.getDeptName()+"的"+conference.getCreateBy()+"申请"+ conference.getConferenceSite()+"会议室");
         workflow.setType("会议申请");
@@ -221,6 +221,7 @@ public class HandleAffairsServiceImpl implements IHandleAffairsService {
         workflow.setState("0");
         workflow.setCreateBy(SecurityUtils.getUsername());
         workflow.setCreateTime(DateUtils.getNowDate());
+        workflow.setCreateName(SecurityUtils.getUsername());
         switch (handleAffairs.getType()) {
             case "0":
                 workflow.setTitle(handleAffairs.getCompany() + "的" + handleAffairs.getTitle());
@@ -228,6 +228,7 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService
         workflow.setEndTime(DateFormatUtils.format(leaveApplication.getEndDate(),"yyyy-MM-dd HH:mm:ss"));
         workflow.setState("0");
         workflow.setCreateBy(SecurityUtils.getUsername());
+        workflow.setCreateName(SecurityUtils.getUsername());
         workflow.setCreateTime(DateUtils.getNowDate());
         if("公休假".equals(leaveApplication.getType())){
@@ -142,6 +142,7 @@ public class LogisticsManagementServiceImpl implements ILogisticsManagementServi
         workflow.setId("logistics:" + logisticsManagement.getId().toString());
         workflow.setState("0");
         workflow.setCreateBy(SecurityUtils.getUsername());
+        workflow.setCreateName(SecurityUtils.getUsername());
         workflow.setCreateTime(DateUtils.getNowDate());
         Integer index = null;
         switch (logisticsManagement.getType()) {