fix:npe

src/main/java/cn/com/poc/agent_application/convert/BizAgentApplicationMallConvert.java

@@ -119,8 +119,8 @@ public class BizAgentApplicationMallConvert {
         BizAgentApplicationPublishService agentApplicationPublishService = SpringUtils.getBean(BizAgentApplicationPublishServiceImpl.class);
         BizAgentApplicationPublishEntity publishEntity = agentApplicationPublishService.get(item.getAgentPublishId());
 
-        AgentApplicationBaseInfo baseInfo = new AgentApplicationBaseInfo();
         if (publishEntity != null) {
+            AgentApplicationBaseInfo baseInfo = new AgentApplicationBaseInfo();
             baseInfo.setMemberId(publishEntity.getMemberId());
             baseInfo.setAgentId(publishEntity.getAgentId());
             baseInfo.setAgentTitle(publishEntity.getAgentTitle());
@@ -129,10 +129,8 @@ public class BizAgentApplicationMallConvert {
             baseInfo.setAgentSystem(publishEntity.getAgentSystem());
             baseInfo.setAgentPublishStatus(publishEntity.getAgentPublishStatus());
             baseInfo.setPublishTime(publishEntity.getPublishTime());
-        }
 
-        AgentApplicationCommConfig commConfig = new AgentApplicationCommConfig();
-        if (publishEntity != null) {
+            AgentApplicationCommConfig commConfig = new AgentApplicationCommConfig();
             commConfig.setPreamble(publishEntity.getPreamble());
             commConfig.setFeaturedQuestions(publishEntity.getFeaturedQuestions());
             commConfig.setContinuousQuestionStatus(publishEntity.getContinuousQuestionStatus());
@@ -140,32 +138,26 @@ public class BizAgentApplicationMallConvert {
             commConfig.setContinuousQuestionTurn(publishEntity.getContinuousQuestionTurn());
             commConfig.setVariableStructure(publishEntity.getVariableStructure());
             commConfig.setIsLongMemory(publishEntity.getIsLongMemory());
-        }
 
-        AgentApplicationKnowledgeConfig knowledgeConfig = new AgentApplicationKnowledgeConfig();
-        if (publishEntity != null) {
+            AgentApplicationKnowledgeConfig knowledgeConfig = new AgentApplicationKnowledgeConfig();
             knowledgeConfig.setKnowledgeIds(publishEntity.getKnowledgeIds());
-        }
 
-        AgentApplicationCommModelConfig commModelConfig = new AgentApplicationCommModelConfig();
-        if (publishEntity != null) {
+            AgentApplicationCommModelConfig commModelConfig = new AgentApplicationCommModelConfig();
             commModelConfig.setLargeModel(publishEntity.getLargeModel());
             commModelConfig.setTopP(publishEntity.getTopP());
             commModelConfig.setCommunicationTurn(publishEntity.getCommunicationTurn());
+
+            dto.setUnitIds(publishEntity.getUnitIds());
+            dto.setBaseInfo(baseInfo);
+            dto.setCommConfig(commConfig);
+            dto.setKnowledgeConfig(knowledgeConfig);
+            dto.setCommModelConfig(commModelConfig);
         }
 
         dto.setId(item.getId());
         dto.setAgentType(item.getAgentType());
         dto.setCollectNumber(item.getCollectNumber());
         dto.setClickNumber(item.getClickNumber());
-        dto.setBaseInfo(baseInfo);
-        dto.setCommConfig(commConfig);
-        dto.setKnowledgeConfig(knowledgeConfig);
-        dto.setCommModelConfig(commModelConfig);
-        if (publishEntity != null) {
-            dto.setUnitIds(publishEntity.getUnitIds());
-        }
-
         dto.setIsCopy(item.getIsCopy());
         dto.setIsSale(item.getIsSale());
         dto.setPopularity(item.getPopularity());

src/main/java/cn/com/poc/agent_application/query/MemberCollectQuery.sql

@@ -4,8 +4,9 @@ select distinct baap.member_id    as member_id,
        baap.agent_desc   as agent_desc,
        baap.agent_avatar as agent_avatar
 from biz_member_agent_application_collect bmaac
-left join biz_agent_application_publish baap on baap.agent_id = bmaac.agent_id and bmaac.is_deleted = 'N'
+left join biz_agent_application_publish baap on baap.agent_id = bmaac.agent_id
 where baap.is_deleted = 'N'
+and bmaac.is_deleted = 'N'
 <<and bmaac.is_collect = :isCollect>>
 <<and bmaac.member_id = :memberId>>
 order by baap.created_time desc
\ No newline at end of file