From 010831d718aa69b0aefed56461f6abaf6143f128 Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Mon, 10 Jan 2022 17:25:44 +0800
Subject: [PATCH] fix:bug

---
 .../jero/data/controller/PayCaseCommitteeController.java  | 8 ++++----
 .../com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml   | 5 ++++-
 .../data/mapper/xml/PayCaseCommitteeSubitemMapper.xml     | 2 +-
 .../project/mapper/xml/PayWorkingGroupDataFileMapper.xml  | 3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
index 383e3b2e..c27b5a46 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
@@ -157,13 +157,13 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 		queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeDTO.getName());
 			PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false);
 			if (!ObjectUtils.isEmpty(one)) {
-				return Result.error("分标委名已存在");
+				return Result.error("分标委名称已存在");
 			}
 		LambdaQueryWrapper<PayCaseCommittee> queryWrapper2 = new LambdaQueryWrapper<>();
 		queryWrapper2.eq(PayCaseCommittee::getAbbreviation,payCaseCommitteeDTO.getAbbreviation());
 		PayCaseCommittee one2 = payCaseCommitteeService.getOne(queryWrapper2,false);
 		if (!ObjectUtils.isEmpty(one2)) {
-			return Result.error("分标简称已存在");
+			return Result.error("分标委简称已存在");
 		}
 		PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
 		BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee);
@@ -190,14 +190,14 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 		queryWrapper.ne(PayCaseCommittee::getId,payCaseCommitteeUpdateDTO.getId());
 		PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false);
 		if (!ObjectUtils.isEmpty(one)) {
-			return Result.error("分标委名已存在");
+			return Result.error("分标委名称已存在");
 		}
 		LambdaQueryWrapper<PayCaseCommittee> queryWrapper2 = new LambdaQueryWrapper<>();
 		queryWrapper2.eq(PayCaseCommittee::getAbbreviation,payCaseCommitteeUpdateDTO.getAbbreviation());
 		queryWrapper2.ne(PayCaseCommittee::getId,payCaseCommitteeUpdateDTO.getId());
 		PayCaseCommittee one2 = payCaseCommitteeService.getOne(queryWrapper2,false);
 		if (!ObjectUtils.isEmpty(one2)) {
-			return Result.error("分标简称已存在");
+			return Result.error("分标委简称已存在");
 		}
 		PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
 		BeanUtils.copyProperties(payCaseCommitteeUpdateDTO, payCaseCommittee);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
index 26f8a047..7b1b4f6e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
@@ -24,7 +24,10 @@
     </resultMap>
 
     <select id="detail" resultMap="searchFile">
-        SELECT  pcc.name,pcc.id,pcc.remarks,pcc.create_by as principal ,#{userId} as userId FROM pay_case_committee pcc where pcc.id=#{id}
+        SELECT  pcc.name,pcc.id,pcc.remarks,su.realname as principal ,#{userId} as userId
+        FROM pay_case_committee 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_committee 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/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
index ec0e247a..1e518f36 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
@@ -22,7 +22,7 @@
         left join pay_company_management pcm on(pm.company_id=pcm.id)
         <if test=" userId!=null and userId != ''">
             left join pay_meeting pme on (pe.id=pme.case_committee_id)
-            left join pay_meeting_contacts pmc on pm.id = pmc.meeting_id
+            left join pay_meeting_contacts pmc on pme.id = pmc.meeting_id
         </if>
         <where>
             <if test=" name!=null and name != ''">
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml
index 77b974df..9dcdd5dc 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml
@@ -7,7 +7,7 @@
             pwgdf.id,
             pwgdf.project_id,
             pwgdf.file_id,
-            pwgdf.create_by,
+            su.realname as create_by,
             pwgdf.create_time,
             pwgdf.update_by,
             pwgdf.update_time,
@@ -15,6 +15,7 @@
             (SELECT count(*) FROM pay_file_download_record where file_id = pwgdf.file_id) AS downloadCount
         FROM pay_working_group_data_file pwgdf
         LEFT JOIN oss_file osf ON  pwgdf.file_id = osf.id
+        left join sys_user su on(pwgdf.create_by=su.username)
         where project_id = #{payWorkingGroupDataFile.projectId} AND project_type = #{payWorkingGroupDataFile.projectType}
         <if test="payWorkingGroupDataFile.fileName != null and payWorkingGroupDataFile.fileName != ''">
             AND osf.file_name LIKE CONCAT('%',CONCAT(#{payWorkingGroupDataFile.fileName},'%'))