18792927508 преди 2 години
родител
ревизия
4c5713300c

+ 12
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Целия файл

752
     /** 联系地址 */
752
     /** 联系地址 */
753
     @Excel(name = "被申请人主体信息-代理人联系地址",width = 26)
753
     @Excel(name = "被申请人主体信息-代理人联系地址",width = 26)
754
     private String debtorContactAddressAgent;
754
     private String debtorContactAddressAgent;
755
+    /**
756
+     * 申请机构id
757
+     */
758
+    private String applicationOrganId;
759
+
760
+    public String getApplicationOrganId() {
761
+        return applicationOrganId;
762
+    }
763
+
764
+    public void setApplicationOrganId(String applicationOrganId) {
765
+        this.applicationOrganId = applicationOrganId;
766
+    }
755
 
767
 
756
     public int getIdentityType() {
768
     public int getIdentityType() {
757
         return identityType;
769
         return identityType;

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Целия файл

155
                 }
155
                 }
156
                 if (StrUtil.isEmpty(caseApplication.getNameId()) && role.getRoleName().equals("申请人")) {
156
                 if (StrUtil.isEmpty(caseApplication.getNameId()) && role.getRoleName().equals("申请人")) {
157
                     // 查询角色有关的用户部门
157
                     // 查询角色有关的用户部门
158
-                    caseApplication.setNameId(String.valueOf(sysUser.getDeptId()));
158
+                    caseApplication.setApplicationOrganId(String.valueOf(sysUser.getDeptId()));
159
                 }
159
                 }
160
                 if (role.getRoleName().equals("被申请人")) {
160
                 if (role.getRoleName().equals("被申请人")) {
161
                     //
161
                     //

+ 4
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Целия файл

126
             <if test="caseNum != null and caseNum != ''">
126
             <if test="caseNum != null and caseNum != ''">
127
                 AND c.case_num = #{caseNum}
127
                 AND c.case_num = #{caseNum}
128
             </if>
128
             </if>
129
+            <if test="nameId != null and nameId != ''">
130
+                AND ca.application_organ_id=#{nameId}  AND ca.identity_type=1
131
+            </if>
129
             <if test="caseStatusList != null and caseStatusList.size() > 0">
132
             <if test="caseStatusList != null and caseStatusList.size() > 0">
130
                 and c.case_status in
133
                 and c.case_status in
131
                 <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
134
                 <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
161
 
164
 
162
             <!--申请人-->
165
             <!--申请人-->
163
             <if test="nameId != null and nameId != ''">
166
             <if test="nameId != null and nameId != ''">
164
-                or ( t.application_organ_id = #{nameId} AND t.identity_type=1
167
+                or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1
165
                 and t.case_status in (0,2,17))
168
                 and t.case_status in (0,2,17))
166
 
169
 
167
             </if>
170
             </if>