From 4c5713300ccea0bc38af617d24fa11d6e641fa74 Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Mon, 6 Nov 2023 14:50:46 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wisdomarbitrate/domain/CaseApplication.java      | 12 ++++++++++++
 .../service/impl/CaseApplicationServiceImpl.java     |  2 +-
 .../mapper/wisdomarbitrate/CaseApplicationMapper.xml |  5 ++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
index 134caf8..d6be890 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
@@ -752,6 +752,18 @@ public class CaseApplication  extends BaseEntity {
     /** 联系地址 */
     @Excel(name = "被申请人主体信息-代理人联系地址",width = 26)
     private String debtorContactAddressAgent;
+    /**
+     * 申请机构id
+     */
+    private String applicationOrganId;
+
+    public String getApplicationOrganId() {
+        return applicationOrganId;
+    }
+
+    public void setApplicationOrganId(String applicationOrganId) {
+        this.applicationOrganId = applicationOrganId;
+    }
 
     public int getIdentityType() {
         return identityType;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
index 7f9f681..6dd86df 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
@@ -155,7 +155,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 }
                 if (StrUtil.isEmpty(caseApplication.getNameId()) && role.getRoleName().equals("申请人")) {
                     // 查询角色有关的用户部门
-                    caseApplication.setNameId(String.valueOf(sysUser.getDeptId()));
+                    caseApplication.setApplicationOrganId(String.valueOf(sysUser.getDeptId()));
                 }
                 if (role.getRoleName().equals("被申请人")) {
                     //
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
index d7ef77d..2ac9711 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
@@ -126,6 +126,9 @@
             <if test="caseNum != null and caseNum != ''">
                 AND c.case_num = #{caseNum}
             </if>
+            <if test="nameId != null and nameId != ''">
+                AND ca.application_organ_id=#{nameId}  AND ca.identity_type=1
+            </if>
             <if test="caseStatusList != null and caseStatusList.size() > 0">
                 and c.case_status in
                 <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
@@ -161,7 +164,7 @@
 
             <!--申请人-->
             <if test="nameId != null and nameId != ''">
-                or ( t.application_organ_id = #{nameId} AND t.identity_type=1
+                or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1
                 and t.case_status in (0,2,17))
 
             </if>