Ver código fonte

问题修改

yangkaixuan 3 semanas atrás
pai
commit
7186dd5f17

+ 4 - 0
takai-admin/src/main/java/com/takai/web/controller/system/SysProjectController.java

@@ -5,6 +5,7 @@ import com.takai.common.core.controller.BaseController;
 import com.takai.common.core.domain.AjaxResult;
 import com.takai.common.core.page.TableDataInfo;
 import com.takai.common.enums.BusinessType;
+import com.takai.common.utils.StringUtils;
 import com.takai.common.utils.poi.ExcelUtil;
 import com.takai.system.domain.SysProject;
 import com.takai.system.service.ISysProjectService;
@@ -99,6 +100,9 @@ public class SysProjectController extends BaseController
     @GetMapping("/alllist")
     public AjaxResult alllist(SysProject sysProject)
     {
+        if(null == sysProject.getProjectId() && (null == sysProject.getProjectName() || StringUtils.isEmpty(sysProject.getProjectName()))){
+            return success(null);
+        }
         return success(sysProjectService.selectSysProjectList(sysProject));
     }
 }

+ 1 - 1
takai-ai/src/main/java/com/takai/ai/domain/entity/TakaiApplication.java

@@ -84,7 +84,7 @@ public class TakaiApplication extends BaseEntity
     private String addOrderBy;
 
     //项目级应用 返回['项目分类','项目id']
-    private List<String> appProId = new ArrayList<>();
+    private String appProId;
 
     private String visible;
 

+ 1 - 1
takai-ai/src/main/java/com/takai/ai/domain/entity/TakaiApplicationParams.java

@@ -49,7 +49,7 @@ public class TakaiApplicationParams {
 
     private String isDeepThink;
 
-    private String[] appProId;
+    private String appProId;
 
     private String visible;
 

+ 4 - 5
takai-ai/src/main/java/com/takai/ai/service/impl/TakaiAiServiceImpl.java

@@ -1019,7 +1019,7 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
             //关联项目
             if(params.getAppProId() != null){
                 SysProjectApp sysProjectApp = new SysProjectApp();
-                sysProjectApp.setProjectId(params.getAppProId()[1]);
+                sysProjectApp.setProjectId(params.getAppProId());
                 sysProjectApp.setAppId(info.getAppId());
                 sysProjectAppMapper.insertSysProjectApp(sysProjectApp);
             }
@@ -1105,7 +1105,7 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
                     sysProjectAppMapper.deleteSysProjectAppByAppId(appId);
                 }
                 sysProjectApp = new SysProjectApp();
-                sysProjectApp.setProjectId(params.getAppProId()[1]);
+                sysProjectApp.setProjectId(params.getAppProId());
                 sysProjectApp.setAppId(appId);
                 sysProjectAppMapper.insertSysProjectApp(sysProjectApp);
             }
@@ -1195,9 +1195,8 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
                 SysProjectApp sysProjectApp = sysProjectAppMapper.selectSysProjectAppByAppId(application.getAppId());
                 if (sysProjectApp != null) {
                     SysProject sysProject = sysProjectMapper.selectSysProjectByProjectId(sysProjectApp.getProjectId());
-                    takaiApplication.setAppProId(Arrays.asList(
-                            String.valueOf(sysProject.getSourceFrom()),
-                            String.valueOf(sysProject.getProjectId())));
+                    takaiApplication.setAppProId(
+                            String.valueOf(sysProject.getProjectId()));
                 }
             }
             List<String> idList = Arrays.stream(takaiApplication.getKnowledgeIds().split(",")) // 按「逗号+空格」拆分字符串为数组

+ 1 - 1
takai-system/src/main/java/com/takai/system/domain/SysProject.java

@@ -23,7 +23,7 @@ public class SysProject extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
-    private long projectId;
+    private Long projectId;
 
     /** 项目编号 */
     @Excel(name = "项目编号", needMerge = true,width = 20)

+ 1 - 0
takai-system/src/main/resources/mapper/system/SysProjectMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sourceFrom != null and sourceFrom != '' ">
                 and sp.source_from = #{sourceFrom}
             </if>
+            <if test="projectId != null  and projectId != ''"> and sp.project_id = #{projectId}</if>
         </where>
     </select>