|
@@ -37,7 +37,6 @@ import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.io.FileUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import cn.hutool.poi.excel.ExcelUtil;
|
|
|
import cn.hutool.poi.excel.ExcelWriter;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -604,8 +603,11 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- public IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, Long mtCompanyId, int days) {
|
|
|
- return baseMapper.toConfirmAnnualInspection(page, mtCompanyId, days);
|
|
|
+ public IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, Long mtCompanyId, Long userId, String currentRoleCode, int days) {
|
|
|
+ if (Objects.equals(currentRoleCode, CommonEnum.DefaultRole.HIGH_DIRECTOR.getCode())) {
|
|
|
+ userId = 0L;
|
|
|
+ }
|
|
|
+ return baseMapper.toConfirmAnnualInspection(page, mtCompanyId, userId, days);
|
|
|
}
|
|
|
|
|
|
/**
|