From c9e5b0eac615092f0084df874e24df0faaddbb8a Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 20 May 2022 15:22:30 +0800
Subject: [PATCH] =?UTF-8?q?space=E7=B3=BB=E7=BB=9F=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/mapper/ProjectNameInfoEOMapper.java     | 2 +-
 .../project/service/impl/ProjectNameInfoEOServiceImpl.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java
index 42730de8a..540eb8ffb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface ProjectNameInfoEOMapper extends BaseMapper<ProjectNameInfoEO> {
-    @Select("select pni.project_name,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" +
+    @Select("select pni.id,pni.project_name,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" +
             "from project_name_info as pni\n" +
             "left join project_year_name_info as pyni on pni.id=pyni.project_name_id;")
     List<ProjectNameInfoEO> selectProjectNameAndYear();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java
index ee7da8ae2..f93950a5a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java
@@ -105,9 +105,9 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
 
 	@Override
 	public String getSpaceInfo(){
-		String sign ="";
+		String jsonData ="";
 		try {
-//			sign = spaceService.getSign();
+		//	jsonData = spaceService.getSign();
 
 			String jsonData = "{\n" +
 					"    \"resultData\": [\n" +
@@ -308,7 +308,7 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-		}return sign;
+		}return jsonData;
 	}
 
 }