|
|
@ -3,6 +3,7 @@ package com.supervision.knowsub.service.impl;
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
import com.supervision.knowsub.domain.UserInfo;
|
|
|
|
import com.supervision.knowsub.domain.UserInfo;
|
|
|
|
import com.supervision.knowsub.dto.base.UserBaseOperateAuthDTO;
|
|
|
|
import com.supervision.knowsub.dto.base.UserBaseOperateAuthDTO;
|
|
|
@ -84,6 +85,16 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
|
|
|
|
}).toList();
|
|
|
|
}).toList();
|
|
|
|
// 进行只是的标记操作
|
|
|
|
// 进行只是的标记操作
|
|
|
|
markKnowledgeOperationFlag(list);
|
|
|
|
markKnowledgeOperationFlag(list);
|
|
|
|
|
|
|
|
// status是查全部,则在页面展示的时候,需要把16,17进行转换
|
|
|
|
|
|
|
|
if (ObjectUtil.isNull(status)){
|
|
|
|
|
|
|
|
for (KnowledgePageResVO knowledgePageResVO : list) {
|
|
|
|
|
|
|
|
// 如果状态是16,17,则在页面展示的时候,展示为通过
|
|
|
|
|
|
|
|
if (Objects.equals(knowledgePageResVO.getStatus(), StatusEnum.RECALL_APPROVAL_RECALL.getStatus())
|
|
|
|
|
|
|
|
|| Objects.equals(knowledgePageResVO.getStatus(), StatusEnum.RECALL_APPROVAL_DELETE.getStatus())){
|
|
|
|
|
|
|
|
knowledgePageResVO.setStatus(StatusEnum.PASS.getStatus());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
knowledgeIPage.setRecords(list);
|
|
|
|
knowledgeIPage.setRecords(list);
|
|
|
|
return knowledgeIPage;
|
|
|
|
return knowledgeIPage;
|
|
|
|
}
|
|
|
|
}
|
|
|
|