From b4b3f57f0272bf54dc9a5d0650258925a3ed757c Mon Sep 17 00:00:00 2001
From: gaosong <gao1532114>
Date: Thu, 7 Dec 2023 17:58:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5=E7=81=AB?=
 =?UTF-8?q?=E5=B1=B1=E5=BC=95=E6=93=8E=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E5=8F=91=E5=9C=A8=E7=A0=94=E7=9A=84=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryBaseServiceImpl.java      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 24e00bfe9..6e029ab76 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -3251,9 +3251,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Override
 	public JSONArray getProjectInfo() {
 		Date now = new Date();
-		List<ProjectLibraryBase> plbList = this.getList(new ProjectLibraryBase());
+		ProjectLibraryBase plbWra = new ProjectLibraryBase();
+		//只查询在研状态
+		plbWra.setProjectStatus("b99df0cf14984eaa9b9e80623be3f480");
+		List<ProjectLibraryBase> plbList = this.getList(plbWra);
 		JSONArray resList = new JSONArray();
 		for (ProjectLibraryBase plb: plbList) {
+			if(StringUtils.isNotBlank(plb.getPlatform()) && plb.getPlatform().equals("YES")){
+				continue;
+			}
 			JSONObject jsonObject = new JSONObject();
 			jsonObject.put("projectId",plb.getId());
 			jsonObject.put("projectName",plb.getShowName());
@@ -3291,9 +3297,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 	@Override
 	public JSONArray getProjectProgressInfo() {
-		List<ProjectLibraryBase> plbList = this.getList(new ProjectLibraryBase());
+		ProjectLibraryBase plbWra = new ProjectLibraryBase();
+		//只查询在研状态
+		plbWra.setProjectStatus("b99df0cf14984eaa9b9e80623be3f480");
+		List<ProjectLibraryBase> plbList = this.getList(plbWra);
 		JSONArray resList = new JSONArray();
 		for (ProjectLibraryBase plb: plbList) {
+			if(StringUtils.isNotBlank(plb.getPlatform()) && plb.getPlatform().equals("YES")){
+				continue;
+			}
 			JSONObject jsonObject = new JSONObject();
 			jsonObject.put("projectId",plb.getId());
 			jsonObject.put("projectName",plb.getShowName());