diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index a3f52f2bd..be7b73a69 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -3,6 +3,7 @@ package com.jero.modules.project.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.service.IProjectLibraryBaseService;
@@ -45,9 +46,23 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 	@PostMapping(value = "/page")
 	public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
 		IPage<ProjectLibraryBase> pageList= projectLibraryBaseService.queryPageList(params);
-		return Result.OK(pageList);
+		List<ProjectLibraryBase> records =convertData(pageList.getRecords(),params.get("cut").toString());
+		return Result.OK(records);
+	}
+	public List<ProjectLibraryBase> convertData(List<ProjectLibraryBase> records, String cut){
+		//分页列表数据中英切换
+		if(CutEnum.EN.getValue().equals(cut)) {
+			for (ProjectLibraryBase data : records) {
+				data.setTargetMarketName(data.getTargetMarketEnName());
+				data.setProjectStatusName(data.getProjectStatusEnName());
+				data.setStudioEngineerName(data.getStudioEngineerEnName());
+				data.setCertificationEngineerName(data.getCertificationEngineerEnName());
+				data.setDigitalPlatformName(data.getDigitalPlatformEnName());
+				data.setVehiclePlatformName(data.getVehiclePlatformEnName());
+			}
+		}
+		return records;
 	}
-
     /**
 	 * 列表查询
 	 *
@@ -126,12 +141,14 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 	@AutoLog(value = "项目库基础表-通过id查询")
 	@ApiOperation(value="项目库基础表-通过id查询", notes="项目库基础表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		ProjectLibraryBase projectLibraryBase = projectLibraryBaseService.queryById(id);
-		if(projectLibraryBase==null) {
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id,
+							   @RequestParam(name="cut",required=true) String cut) {
+//		List<ProjectLibraryBase> data = projectLibraryBaseService.queryById(id);
+		List<ProjectLibraryBase> records =convertData(projectLibraryBaseService.queryById(id),cut);
+		if(records==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(projectLibraryBase);
+		return Result.OK(records);
 	}
 
     /**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index dce994a16..8313d13fa 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -93,8 +93,6 @@ public class ProjectLibraryBase implements Serializable {
     private java.lang.String createUserId;
     @TableField(exist = false)
     private java.lang.String createUserName;
-    @TableField(exist = false)
-    private java.lang.String createUserEnName;
 
     /**创建日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -105,8 +103,7 @@ public class ProjectLibraryBase implements Serializable {
     private java.lang.String updateUserId;
     @TableField(exist = false)
     private java.lang.String updateUserName;
-    @TableField(exist = false)
-    private java.lang.String updateUserEnName;
+
 
     /**更新日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java
index ffd0b5511..06e9bb28c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -13,6 +14,10 @@ import java.util.Map;
  * @Version: V1.0
  */
 public interface ProjectLibraryBaseMapper extends BaseMapper<ProjectLibraryBase> {
-
+    /**分页列表*/
     IPage<ProjectLibraryBase> queryPageList(IPage page, Map<String, Object> params);
+
+    /**根据id查询*/
+    List<ProjectLibraryBase> queryById(String id);
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 7bafdf9c5..4de51d955 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -22,50 +22,54 @@
     </resultMap>
 
     <!--不行，改。哪有这么写SQL，嫌性能太好？ TODO-->
-    <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+    <sql id="select_item">
         select
-        plb.id,
-        plb.project_name,
+            plb.id,
+            plb.project_name,
 
-        plb.target_market,
-        marketsdi.item_text as target_market_name,
-        marketsdi.en_name as target_market_en_name,
-        plb.project_status,
-        statussdi.item_text as project_status_name,
-        statussdi.en_name as project_status_en_name,
-        plb.studio_engineer,
-        studiouser.realname as studio_engineer_name,
-        studiouser.username as studio_engineer_en_name,
-        plb.certification_engineer,
-        certifyuser.realname as certification_engineer_name,
-        certifyuser.username as certification_engineer_en_name,
-        plb.vehicle_platform,
-        vehiclePlatformsdi.item_text as vehicle_platform_name,
-        vehiclePlatformsdi.en_name as vehicle_platform_en_name,
-        plb.digital_platform,
-        digitalPlatformsdi.item_text as digital_platform_name,
-        digitalPlatformsdi.en_name as digital_platform_en_name,
-        plb.ipd_info,
-        plb.vehicle_development_plan,
-        plb.attestation_plan,
-        plb.create_user_id,
-        createuser.realname as create_user_name,
-        createuser.username as create_user_en_name,
-        plb.create_time,
-        plb.update_user_id,
-        createuser.realname as update_user_name,
-        createuser.username as update_user_en_name,
-        plb.update_time
+            plb.target_market,
+            marketsdi.item_text as target_market_name,
+            marketsdi.en_name as target_market_en_name,
+            plb.project_status,
+            statussdi.item_text as project_status_name,
+            statussdi.en_name as project_status_en_name,
+            plb.studio_engineer,
+            studiouser.realname as studio_engineer_name,
+            studiouser.username as studio_engineer_en_name,
+            plb.certification_engineer,
+            certifyuser.realname as certification_engineer_name,
+            certifyuser.username as certification_engineer_en_name,
+            plb.vehicle_platform,
+            vehiclePlatformsdi.item_text as vehicle_platform_name,
+            vehiclePlatformsdi.en_name as vehicle_platform_en_name,
+            plb.digital_platform,
+            digitalPlatformsdi.item_text as digital_platform_name,
+            digitalPlatformsdi.en_name as digital_platform_en_name,
+            plb.ipd_info,
+            plb.vehicle_development_plan,
+            plb.attestation_plan,
+            plb.create_user_id,
+            createuser.username as create_user_name,
+            plb.create_time,
+            plb.update_user_id,
+            updateuser.username as update_user_name,
+            plb.update_time
         from project_library_base as plb
 
-        left join sys_dict_item as marketsdi on plb.target_market=marketsdi.id
-        left join sys_dict_item as statussdi on plb.project_status=statussdi.id
-        left join sys_user as studiouser on plb.studio_engineer=studiouser.id
-        left join sys_user as certifyuser on plb.certification_engineer=certifyuser.id
-        left join sys_dict_item as vehiclePlatformsdi on plb.vehicle_platform=vehiclePlatformsdi.id
-        left join sys_dict_item as digitalPlatformsdi on plb.digital_platform=digitalPlatformsdi.id
-        left join sys_user as createuser on plb.create_user_id=createuser.id
-        left join sys_user as updateuser on plb.create_user_id=updateuser.id
+                 left join sys_dict_item as marketsdi on plb.target_market=marketsdi.item_value
+                 left join sys_dict_item as statussdi on plb.project_status=statussdi.item_value
+                 left join sys_user as studiouser on plb.studio_engineer=studiouser.id
+                 left join sys_user as certifyuser on plb.certification_engineer=certifyuser.id
+                 left join sys_dict_item as vehiclePlatformsdi on plb.vehicle_platform=vehiclePlatformsdi.item_value
+                 left join sys_dict_item as digitalPlatformsdi on plb.digital_platform=digitalPlatformsdi.item_value
+                 left join sys_user as createuser on plb.create_user_id=createuser.id
+                 left join sys_user as updateuser on plb.update_user_id=updateuser.id
+    </sql>
+
+    <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+
+        <include refid="select_item"/>
+
         <where>
             <if test="params.projectName != null and params.projectName != ''">
                 <!--搜索条件:项目名称,包含%,单独搜索-->
@@ -125,4 +129,14 @@
         </where>
         order by plb.create_time desc
     </select>
+
+    <select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+        <include refid="select_item"/>
+        <where>
+            <if test="id != null and id != '' ">
+                plb.id=#{id}
+            </if>
+        </where>
+        order by plb.create_time desc
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
index 1a1e76e84..a1696c568 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
@@ -53,7 +53,7 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	 * @param id
 	 * @return
 	 */
-    ProjectLibraryBase queryById(String id);
+	List<ProjectLibraryBase> queryById(String id);
 
     /**
 	 * 列表查询
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 a556de5ad..f3aef4cfe 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
@@ -3,7 +3,6 @@ package com.jero.modules.project.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
@@ -26,6 +25,7 @@ import java.util.Map;
 public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBaseMapper, ProjectLibraryBase> implements IProjectLibraryBaseService {
 	@Autowired
 	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
+
 	/**
 	 * 保存
 	 *
@@ -87,8 +87,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 * @return
 	 */
 	@Override
-	public ProjectLibraryBase queryById(String id) {
-		return getById(id);
+	public List<ProjectLibraryBase> queryById(String id) {
+		List<ProjectLibraryBase> records = projectLibraryBaseMapper.queryById(id);
+			return records;
 	}
 
 	/**
@@ -113,18 +114,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		IPage page = new Page(pageNo, pageSize);
 		IPage<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(page, params);
 		List<ProjectLibraryBase> records = result.getRecords();
-		String cut = (String) params.get("cut");
-		//分页列表数据中英切换
-		if(CutEnum.EN.getValue().equals(cut)){
-			for(ProjectLibraryBase data:records){
-				data.setTargetMarketName(data.getTargetMarketEnName());
-				data.setProjectStatusName(data.getProjectStatusName());
-				data.setStudioEngineerName(data.getStudioEngineerEnName());
-				data.setCertificationEngineer(data.getCertificationEngineerEnName());
-				data.setVehiclePlatformName(data.getVehiclePlatformEnName());
-				data.setDigitalPlatformName(data.getDigitalPlatformEnName());
-			}
-		}
+
 		return result;
 	}
+
+
+
 }
+
+