|
@@ -407,7 +407,7 @@ public class DataCollectTask {
|
|
User opTmp = userMap.get(leaveSheet.getOperatorId());
|
|
User opTmp = userMap.get(leaveSheet.getOperatorId());
|
|
leaveSheet.setOwnerId(null==ownerTmp?null:ownerTmp.getId());
|
|
leaveSheet.setOwnerId(null==ownerTmp?null:ownerTmp.getId());
|
|
leaveSheet.setOperatorId(null==opTmp?null:opTmp.getId());
|
|
leaveSheet.setOperatorId(null==opTmp?null:opTmp.getId());
|
|
- if(null != ownerTmp && null == opTmp){
|
|
|
|
|
|
+ if(null != ownerTmp && null != opTmp){
|
|
leaveSheet.setOperatorId(ownerTmp.getId());
|
|
leaveSheet.setOperatorId(ownerTmp.getId());
|
|
}
|
|
}
|
|
|
|
|