From 9737afc852e3dafab3ba229d63b3e693f85c8853 Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Wed, 5 Jan 2022 10:42:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=88=86?=
 =?UTF-8?q?=E6=A0=87=E5=A7=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/controller/PayCaseCouncilSubitemController.java    | 4 ++--
 .../src/main/java/com/jero/data/entity/subCouncil.java      | 6 +++---
 .../jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml  | 4 ++--
 .../jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml    | 2 +-
 .../project/controller/PayResearchProjectController.java    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
index d441d2b7..dd6195b1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
@@ -266,8 +266,8 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
 	  */
 
 	 @RequiresPermissions("council:export")
-	 @AutoLog(value = "分标委表导出-导出")
-	 @ApiOperation(value="分标委表导出-导出", notes="分标委表导出-导出")
+	 @AutoLog(value = "理事会-导出")
+	 @ApiOperation(value="理事会-导出", notes="理事会-导出")
 	 @GetMapping(value = "/exportXls",produces = "text/text;charset=utf-8")
 	 public ModelAndView customExportXlsList(@RequestParam(name="contactsName",required =false) String contactsName,
 											 @RequestParam(name = "selects",required = false) String selects,
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java
index 2659a767..003d8432 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java
@@ -12,12 +12,12 @@ public class subCouncil implements Serializable {
     @ApiModelProperty(value = "主键")
     private String id;
 
-    @ApiModelProperty(value = "企业名称")
-    private String companyName;
-
     @ApiModelProperty(value = "姓名")
     private String peopleName;
 
+    @ApiModelProperty(value = "企业名称")
+    private String companyName;
+
     @ApiModelProperty(value = "电话")
     private String phone;
 
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 0c44039e..ac6540e0 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
@@ -70,8 +70,8 @@
             <if test=" companyName!=null and companyName != ''">
                 AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
             </if>
-            <if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
-                AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
+            <if test=" councilName!=null and councilName != ''">
+                AND pe.name LIKE CONCAT('%',#{councilName},'%')
             </if>
         </where>
         order by pe.create_time desc
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 430529e0..c137eb83 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
@@ -39,7 +39,7 @@
         order by pe.create_time desc
     </select>
     <select id="listForChildren" 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 e4a8903e..8a43b463 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
@@ -152,9 +152,9 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
 	public Result<?> edit(@RequestBody PayResearchProject payResearchProject) {
 		QueryWrapper<PayResearchProject> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("project_name",payResearchProject.getProjectName());
-		queryWrapper.eq("id",payResearchProject.getId());
+		queryWrapper.eq("working_group_id",payResearchProject.getWorkingGroupId());
 		int count = payResearchProjectService.count(queryWrapper);
-		if (count>1) {
+		if (count>0) {
 			return Result.error("项目名称已存在");
 		}
 		//删除关联文件表