Merge remote-tracking branch 'origin/dev' into dev

pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.log.mapper.OptLogMapper;
 import com.ningdatech.log.model.domain.OptLog;
+import com.ningdatech.pmapi.common.constant.BizConst;
 import com.ningdatech.pmapi.organization.mapper.DingEmployeeInfoMapper;
 import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo;
 import com.ningdatech.pmapi.scheduler.task.model.CommonLog;
@@ -79,7 +80,8 @@ public class CommonLogTask {
                String employeeCode = userInfo.getEmployeeCode();
                if (StringUtils.isNotBlank(employeeCode)){
                    DingEmployeeInfo dingEmployeeInfo = dingEmployeeInfoMapper.selectOne(new LambdaQueryWrapper<DingEmployeeInfo>()
-                           .eq(DingEmployeeInfo::getEmployeeCode,employeeCode));
+                           .eq(DingEmployeeInfo::getEmployeeCode,employeeCode)
+                           .last(BizConst.LIMIT_1));
                    if (dingEmployeeInfo != null){
                        commonLog.setUserId(String.valueOf(dingEmployeeInfo.getAccountId()));
                    }