|
@@ -13,6 +13,7 @@ import com.redxun.common.service.impl.SuperServiceImpl;
|
|
import com.redxun.common.tool.StringUtils;
|
|
import com.redxun.common.tool.StringUtils;
|
|
import com.redxun.common.utils.ExceptionUtil;
|
|
import com.redxun.common.utils.ExceptionUtil;
|
|
import com.redxun.common.utils.SysUserUtil;
|
|
import com.redxun.common.utils.SysUserUtil;
|
|
|
|
+import com.redxun.knowledge.common.UserService;
|
|
import com.redxun.knowledge.entity.dao.KnowledgeLabel;
|
|
import com.redxun.knowledge.entity.dao.KnowledgeLabel;
|
|
import com.redxun.knowledge.mapper.KnowledgeLabelMapper;
|
|
import com.redxun.knowledge.mapper.KnowledgeLabelMapper;
|
|
import freemarker.template.ObjectWrapper;
|
|
import freemarker.template.ObjectWrapper;
|
|
@@ -31,6 +32,9 @@ import javax.annotation.Resource;
|
|
@Service
|
|
@Service
|
|
public class KnowledgeLabelServiceImpl extends SuperServiceImpl<KnowledgeLabelMapper, KnowledgeLabel> implements BaseService<KnowledgeLabel> {
|
|
public class KnowledgeLabelServiceImpl extends SuperServiceImpl<KnowledgeLabelMapper, KnowledgeLabel> implements BaseService<KnowledgeLabel> {
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private UserService userService;
|
|
|
|
+
|
|
@Resource
|
|
@Resource
|
|
private KnowledgeLabelMapper knowledgeLabelMapper;
|
|
private KnowledgeLabelMapper knowledgeLabelMapper;
|
|
|
|
|
|
@@ -52,11 +56,11 @@ public class KnowledgeLabelServiceImpl extends SuperServiceImpl<KnowledgeLabelMa
|
|
KnowledgeLabel knowledgeLabel = new KnowledgeLabel();
|
|
KnowledgeLabel knowledgeLabel = new KnowledgeLabel();
|
|
if (StringUtils.isEmpty(id)) {
|
|
if (StringUtils.isEmpty(id)) {
|
|
knowledgeLabel.setPkId(IdGenerator.getIdStr());
|
|
knowledgeLabel.setPkId(IdGenerator.getIdStr());
|
|
- knowledgeLabel.setCreateBy(queryLoginUser());
|
|
|
|
|
|
+ knowledgeLabel.setCreateBy(userService.queryLoginUser());
|
|
knowledgeLabel.setCreateTime(new Date());
|
|
knowledgeLabel.setCreateTime(new Date());
|
|
} else {
|
|
} else {
|
|
knowledgeLabel.setPkId(id);
|
|
knowledgeLabel.setPkId(id);
|
|
- knowledgeLabel.setUpdateBy(queryLoginUser());
|
|
|
|
|
|
+ knowledgeLabel.setUpdateBy(userService.queryLoginUser());
|
|
knowledgeLabel.setCreateTime(new Date());
|
|
knowledgeLabel.setCreateTime(new Date());
|
|
}
|
|
}
|
|
knowledgeLabel.setName(name);
|
|
knowledgeLabel.setName(name);
|
|
@@ -69,18 +73,4 @@ public class KnowledgeLabelServiceImpl extends SuperServiceImpl<KnowledgeLabelMa
|
|
|
|
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
-
|
|
|
|
- private String queryLoginUser() {
|
|
|
|
- String loginUserId = null;
|
|
|
|
- try {
|
|
|
|
- JPaasUser jPaasUser = SysUserUtil.getLoginUser();
|
|
|
|
- if (jPaasUser == null) {
|
|
|
|
- return null;
|
|
|
|
- }
|
|
|
|
- loginUserId = jPaasUser.getUserId();
|
|
|
|
- } catch (IOException e) {
|
|
|
|
- log.error(ExceptionUtil.getExceptionMessage(e));
|
|
|
|
- }
|
|
|
|
- return loginUserId;
|
|
|
|
- }
|
|
|
|
}
|
|
}
|