|
@@ -11,11 +11,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.redxun.common.base.db.BaseDao;
|
|
|
import com.redxun.common.base.db.BaseService;
|
|
|
import com.redxun.common.base.db.PageHelper;
|
|
|
+import com.redxun.common.base.entity.IUser;
|
|
|
import com.redxun.common.base.search.QueryFilter;
|
|
|
import com.redxun.common.model.JPaasUser;
|
|
|
import com.redxun.common.service.impl.SuperServiceImpl;
|
|
|
import com.redxun.common.tool.IdGenerator;
|
|
|
import com.redxun.common.tool.StringUtils;
|
|
|
+import com.redxun.common.utils.ContextUtil;
|
|
|
import com.redxun.dto.user.OsUserDto;
|
|
|
import com.redxun.knowledge.common.MessageService;
|
|
|
import com.redxun.knowledge.common.UserService;
|
|
@@ -117,10 +119,17 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
|
|
|
knowledge.setAttachment(knowledgeDto.getAttachment());
|
|
|
knowledge.setAttachmentName(knowledgeDto.getAttachmentName());
|
|
|
knowledge.setAttachmentType(knowledgeDto.getAttachmentType());
|
|
|
+ knowledge.setApprovalStatus(1);
|
|
|
+ knowledge.setApprovalBatch(1);
|
|
|
knowledge.setContent(knowledgeDto.getContent());
|
|
|
- knowledge.setUpdateBy(userService.queryLoginUser());
|
|
|
- //knowledge.setAuthor(knowledgeDto.getAuthor());
|
|
|
- //knowledge.setCreateBy(knowledgeDto.getCreateBy());
|
|
|
+ IUser users = ContextUtil.getCurrentUser();
|
|
|
+ knowledge.setCreateDepId(users.getDeptId());
|
|
|
+ knowledge.setTenantId(users.getTenantId());
|
|
|
+ knowledge.setCompanyId(users.getCompanyId());
|
|
|
+ knowledge.setCreateBy(users.getUserId());
|
|
|
+ knowledge.setCreateTime(new Date());
|
|
|
+ knowledge.setUpdateBy(users.getUserId());
|
|
|
+ knowledge.setUpdateTime(new Date());
|
|
|
|
|
|
JPaasUser user = userService.queryUser(userService.queryLoginUser());
|
|
|
if (user != null) {
|
|
@@ -143,6 +152,7 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
|
|
|
knowledgeApprove.setApproverId(node.getApproverId());
|
|
|
knowledgeApprove.setApproverName(node.getApproverName());
|
|
|
knowledgeApprove.setApprovalBatch(1);
|
|
|
+ knowledgeApprove.setUpdateBy(users.getUserId());
|
|
|
knowledgeApprove.setSort(index + 1);
|
|
|
knowledgeApprove.setIsFinal(node.getIsFinal());
|
|
|
knowledgeApprove.setCreateBy(userService.queryLoginUser());
|