diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java index 57b0cfd1..77aff5fd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.DateConstant; import org.dromara.common.core.constant.HttpStatus; import org.dromara.common.core.enums.UserType; @@ -47,7 +48,6 @@ import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.contractor.service.ISubContractorService; import org.dromara.project.domain.*; import org.dromara.project.domain.dto.attendance.TodayUserDto; -import org.dromara.project.domain.dto.attendance.TwoWeekDto; import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum; import org.dromara.project.domain.enums.BusAttendanceCommuterEnum; import org.dromara.project.domain.enums.BusConstructionUserAttendanceStatusEnum; @@ -87,6 +87,7 @@ import static org.dromara.project.domain.enums.BusAttendanceClockStatusEnum.ATTE * @author lilemy * @date 2025-03-07 */ +@Slf4j @Service public class SubConstructionUserServiceImpl extends ServiceImpl implements ISubConstructionUserService { @@ -617,7 +618,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl userIdList = constructionUserList.stream().map(SubConstructionUser::getId).toList(); + List userIdList = constructionUserList.stream().map(SubConstructionUser::getSysUserId).toList(); List fileList = constructionUserFileService.lambdaQuery() .select(SubConstructionUserFile::getId, SubConstructionUserFile::getUserId) .in(SubConstructionUserFile::getUserId, userIdList) @@ -1046,12 +1047,12 @@ public class SubConstructionUserServiceImpl extends ServiceImpl= fileTypeSize) { constructionUserVo.setFileUploadStatus(SubConstructionUserFileStatusEnum.UPLOAD.getValue()); } // 解密身份证号码 @@ -1253,7 +1254,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl