Merge remote-tracking branch 'xnjz/master'

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/knowledgebase/KnowledgeBaseController.java

@@ -77,6 +77,14 @@ public class KnowledgeBaseController {
         return success(BeanUtils.toBean(pageResult, KnowledgeBaseRespVO.class));
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得知识库分页")
+    @PreAuthorize("@ss.hasPermission('llm:knowledge-base:query')")
+    public CommonResult<List<KnowledgeBaseRespVO>> getKnowledgeBaseList() {
+        List<KnowledgeBaseDO> list = knowledgeBaseService.getKnowledgeBaseList();
+        return success(BeanUtils.toBean(list, KnowledgeBaseRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出知识库 Excel")
     @PreAuthorize("@ss.hasPermission('llm:knowledge-base:export')")

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelServiceImpl.java

@@ -75,7 +75,7 @@ public class BaseModelServiceImpl implements BaseModelService {
     @Override
     public List<BaseModelDO> getBaseModelList() {
         LambdaQueryWrapper<BaseModelDO> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(BaseModelDO::getIsActive,0);
+        queryWrapper.eq(BaseModelDO::getIsActive,1);
         List<BaseModelDO> baseModelDOS = baseModelMapper.selectList(queryWrapper);
         return baseModelDOS;
     }

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseService.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.llm.controller.admin.knowledgebase.vo.KnowledgeBa
 import cn.iocoder.yudao.module.llm.dal.dataobject.knowledgebase.KnowledgeBaseDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 知识库 Service 接口
@@ -52,4 +53,5 @@ public interface KnowledgeBaseService {
      */
     PageResult<KnowledgeBaseDO> getKnowledgeBasePage(KnowledgeBasePageReqVO pageReqVO);
 
+    List<KnowledgeBaseDO> getKnowledgeBaseList();
 }

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseServiceImpl.java

@@ -13,6 +13,7 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU
 import static cn.iocoder.yudao.module.llm.enums.ErrorCodeConstants.KNOWLEDGE_BASE_NOT_EXISTS;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 知识库 Service 实现类
@@ -68,4 +69,9 @@ public class KnowledgeBaseServiceImpl implements KnowledgeBaseService {
         return knowledgeBaseMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<KnowledgeBaseDO> getKnowledgeBaseList() {
+        return knowledgeBaseMapper.selectList();
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserStudentExcelVO.java

@@ -1,11 +1,17 @@
 package cn.iocoder.yudao.module.system.controller.admin.user.vo.user;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 @Data
-@ExcelIgnoreUnannotated
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
 public class UserStudentExcelVO {
 
     @ExcelProperty("登录账号")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserTeacherExcelVO.java

@@ -1,11 +1,17 @@
 package cn.iocoder.yudao.module.system.controller.admin.user.vo.user;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 @Data
-@ExcelIgnoreUnannotated
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
 public class UserTeacherExcelVO {
 
     @ExcelProperty("登录账号")