From 8e0a01388685cef1dc383e9441b351677fdb922d Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 25 Apr 2022 09:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/mapper/xml/ProjectLibraryBaseMapper.xml   | 4 ++--
 .../service/impl/ProjectRelatedPersonnelServiceImpl.java      | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

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 9743fac94..f8e35c3f6 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
@@ -55,10 +55,10 @@
                 <!--搜索条件:项目名称,包含%,单独搜索-->
                 <choose>
                     <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>
-                        and plb.project_name like '%1%%' escape '1'
+                        and pni.project_name like '%1%%' escape '1'
                     </when>
                     <otherwise>
-                        and plb.project_name like concat('%',#{params.projectName},'%')
+                        and pni.project_name like concat('%',#{params.projectName},'%')
                     </otherwise>
                 </choose>
             </if>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index ea755235c..f6cd6ecef 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -511,7 +511,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						throw new JeroBootException("Only one duty territory can be filled in for import. Please check line " + row);
 					}
 				} else {
-				//	String dictItemsName = sysDictService.queryDictItemByName(DictCodeEnum.DUTY_TERRITORY.getValue(), projectRelatedPersonnel.getDutyTerritory(), cut);
 					String dictItemValue = sysDictService.queryDictItemByValue(DictCodeEnum.DUTY_TERRITORY.getValue(), projectRelatedPersonnel.getDutyTerritory(), cut);
 
 					if (StringUtils.isBlank(dictItemValue)) {
@@ -524,10 +523,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					}else {
 
 						QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
-						//String itemValue = sysDictMapper.queryDictTextByKey(DictCodeEnum.DUTY_TERRITORY.getValue(), projectRelatedPersonnel.getDutyTerritory());
 						List<ProjectRelatedPersonnel> idList = list(queryWrapper.select("id").eq("duty_territory", projectRelatedPersonnel.getDutyTerritory()).eq("project_id",projectId));
 						projectRelatedPersonnel.setId(idList.get(0).getId());
-						//projectRelatedPersonnel.setDutyTerritory(itemValue);
 					}
 				}
 			}else{