From ee9e353c3671f0201b115d4e0acebe95389332fd Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Tue, 11 Jan 2022 17:35:54 +0800
Subject: [PATCH] fix:bug

---
 .../main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml | 2 +-
 .../com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml    | 2 +-
 .../jero/project/controller/PayResearchProjectController.java   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml
index a28cf7b2..e83fc635 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml
@@ -15,7 +15,7 @@
     </resultMap>
 
     <select id="detail" resultMap="searchFile">
-        SELECT  pcc.name,pcc.id,pcc.remarks,pcc.create_by as principal ,#{userId} as userId FROM pay_case_council pcc where pcc.id=#{id}
+        SELECT  pcc.name,pcc.id,pcc.remarks,su.realname as principal ,#{userId} as userId FROM pay_case_council pcc left join sys_user su on(pcc.create_by_id =su.id) where pcc.id=#{id}
      </select>
     <select id="listForChildren" resultType="com.jero.data.entity.Files">
         SELECT  ossf.id as fileId,ossf.file_name as fileName,ossf.create_time as createTime FROM pay_case_council pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
index daba46c2..aab17bb6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
@@ -135,7 +135,7 @@
         order by pe.create_time desc
     </select>
     <select id="listForChildrenTwo" resultType="com.jero.data.entity.subCouncil">
-        SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as id
+        SELECT pm.id as id,pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.phone as phone,pt.post as post
         from
         pay_case_council_subitem pm
         left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
index 8a43b463..54b46501 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
@@ -153,6 +153,7 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
 		QueryWrapper<PayResearchProject> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("project_name",payResearchProject.getProjectName());
 		queryWrapper.eq("working_group_id",payResearchProject.getWorkingGroupId());
+		queryWrapper.ne("id",payResearchProject.getId());
 		int count = payResearchProjectService.count(queryWrapper);
 		if (count>0) {
 			return Result.error("项目名称已存在");