|
|
@ -97,9 +97,12 @@ public class ClockingInService implements IClockingInService { |
|
|
|
otherClockRecord.setMemberName(record.getMemberName()); |
|
|
|
otherClockRecord.setMemberUserId(record.getMemberUserId()); |
|
|
|
clockingInInfo.getRecordList().add(otherClockRecord); |
|
|
|
if (member.getUserId().equals(otherClockRecord.getMemberUserId())) { |
|
|
|
record.setIsMine((byte)1); |
|
|
|
if (ObjectUtil.isNotNull(member)) { |
|
|
|
if (member.getUserId().equals(otherClockRecord.getMemberUserId())) { |
|
|
|
record.setIsMine((byte)1); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}else { |
|
|
|