Merge remote-tracking branch 'origin/main'

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IProjectCommentService.java

@@ -0,0 +1,20 @@
+package com.ruoyi.cms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.cms.domain.ProjectComment;
+
+import java.util.List;
+
+/**
+ * 项目评论 Service 接口
+ *
+ * @author shz
+ * @date 2025-07-06
+ */
+public interface IProjectCommentService extends IService<ProjectComment>
+{
+    /**
+     * 根据项目ID查询评论列表
+     */
+    List<ProjectComment> listByProjectId(Long projectId);
+}

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IProjectService.java

@@ -0,0 +1,20 @@
+package com.ruoyi.cms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.cms.domain.Project;
+
+import java.util.List;
+
+/**
+ * 项目管理 Service 接口
+ *
+ * @author shz
+ * @date 2025-07-06
+ */
+public interface IProjectService extends IService<Project>
+{
+    /**
+     * 查询项目列表（支持多条件筛选）
+     */
+    List<Project> selectProjectList(Project query);
+}

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ProjectCommentServiceImpl.java

@@ -0,0 +1,31 @@
+package com.ruoyi.cms.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cms.domain.ProjectComment;
+import com.ruoyi.cms.mapper.ProjectCommentMapper;
+import com.ruoyi.cms.service.IProjectCommentService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 项目评论 Service 实现
+ *
+ * @author shz
+ * @date 2025-07-06
+ */
+@Service
+public class ProjectCommentServiceImpl
+        extends ServiceImpl<ProjectCommentMapper, ProjectComment>
+        implements IProjectCommentService
+{
+    @Override
+    public List<ProjectComment> listByProjectId(Long projectId)
+    {
+        LambdaQueryWrapper<ProjectComment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProjectComment::getProjectId, projectId);
+        wrapper.orderByAsc(ProjectComment::getCreateTime);
+        return list(wrapper);
+    }
+}

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ProjectServiceImpl.java

@@ -0,0 +1,37 @@
+package com.ruoyi.cms.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cms.domain.Project;
+import com.ruoyi.cms.mapper.ProjectMapper;
+import com.ruoyi.cms.service.IProjectService;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 项目管理 Service 实现
+ *
+ * @author shz
+ * @date 2025-07-06
+ */
+@Service
+public class ProjectServiceImpl
+        extends ServiceImpl<ProjectMapper, Project>
+        implements IProjectService
+{
+    @Override
+    public List<Project> selectProjectList(Project query)
+    {
+        LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(query.getTitle()), Project::getTitle, query.getTitle());
+        wrapper.eq(StringUtils.isNotBlank(query.getIndustry()), Project::getIndustry, query.getIndustry());
+        wrapper.eq(StringUtils.isNotBlank(query.getRegion()), Project::getRegion, query.getRegion());
+        wrapper.eq(StringUtils.isNotBlank(query.getCooperationMode()), Project::getCooperationMode, query.getCooperationMode());
+        wrapper.eq(StringUtils.isNotBlank(query.getStatus()), Project::getStatus, query.getStatus());
+        wrapper.eq(query.getCompanyId() != null, Project::getCompanyId, query.getCompanyId());
+        wrapper.orderByDesc(Project::getCreateTime);
+        return list(wrapper);
+    }
+}

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyInfoServiceImpl.java

@@ -33,8 +33,15 @@ public class PolicyInfoServiceImpl implements IPolicyInfoService {
     public TableDataInfo getPortalList(PolicyInfoQuery query) {
         PageHelper.startPage(query.getPageNum(), query.getPageSize());
         if (StringUtils.isNotEmpty(query.getPolicyTag())) {
-            List<String> policyTags = Arrays.asList(query.getPolicyTag().split(","));
-            query.setPolicyTags(policyTags);
+            System.out.println("query.getPolicyTag()============"+query.getPolicyTag());
+            String policyTag = query.getPolicyTag().trim();
+            if (StringUtils.isNotEmpty(policyTag) && policyTag.endsWith(",")) {
+                policyTag = policyTag.substring(0, policyTag.length() - 1);
+            }
+            if (StringUtils.isNotEmpty(policyTag) && StringUtils.isNotEmpty(policyTag.trim())) {
+                List<String> policyTags = Arrays.asList(policyTag.trim().split(","));
+                query.setPolicyTags(policyTags);
+            }
         }
         // 仅返回启用状态的政策给前端
         query.setStatus("0");