|
@@ -103,6 +103,7 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
|
|
|
KlConcept concept = klConceptFacade.getOne(new QueryWrapper<KlConcept>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("lib_name", staticKnowledgeVO.getName())
|
|
|
+ .eq("status", StatusEnum.Enable.getKey())
|
|
|
.eq("lib_type", type), false);
|
|
|
|
|
|
Integer sameType = 0;
|
|
@@ -138,7 +139,7 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
|
|
|
}
|
|
|
|
|
|
//标准术语存在静态知识不存在,取同名静态知识,仅检验检查
|
|
|
- if (concept != null && staticInfo == null && sameType == null) {
|
|
|
+ if (concept != null && staticInfo == null && sameType.equals(0)) {
|
|
|
//同名静态知识互取
|
|
|
if (type.equals(LexiconEnum.LisName.getKey())) {
|
|
|
sameType = LexiconEnum.LisSubName.getKey();
|
|
@@ -153,6 +154,7 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
|
|
|
KlConcept sameConcept = klConceptFacade.getOne(new QueryWrapper<KlConcept>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("lib_name", staticKnowledgeVO.getName())
|
|
|
+ .eq("status", StatusEnum.Enable.getKey())
|
|
|
.eq("lib_type", sameType), false);
|
|
|
if (sameConcept != null) {
|
|
|
staticInfo = this.getOne(new QueryWrapper<KlConceptStatic>()
|