知识库调整

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/knowledge/mapper/KnowledgeShareTypeMapper.java

@@ -17,6 +17,6 @@ public interface KnowledgeShareTypeMapper extends BaseMapper<KnowledgeShareType>
 
     IPage<KnowledgeShareTypeDto> findList(Page<KnowledgeShareTypeDto> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("type") String type);
 
-    List<KnowledgeShareType> checkList(@Param("type")KnowledgeShareType type);
+    List<KnowledgeShareType> checkList(@Param("type")KnowledgeShareType type,@Param("companyId")String companyId);
 
 }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/knowledge/mapper/xml/KnowledgeShareTypeMapper.xml

@@ -44,6 +44,7 @@
 			del_flag =0
 			AND klgs_key = #{type.klgsKey}
 			AND klgs_type = #{type.klgsType}
+			and company_id = #{companyId}
 			<if test="type.id != null and type.id != ''">
 				AND id != #{type.id}
 			</if>

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/knowledge/service/KnowledgeTypeService.java

@@ -34,7 +34,8 @@ public class KnowledgeTypeService {
     }
 
     public Boolean save(KnowledgeShareType type) {
-        List<KnowledgeShareType> list = mapper.checkList(type);
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        List<KnowledgeShareType> list = mapper.checkList(type,userDTO.getCompanyDTO().getId());
         if (CollectionUtils.isNotEmpty(list)) {
             return false;
         }