Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/SealSignRecord.java

@@ -23,6 +23,16 @@ public class SealSignRecord extends BaseEntity {
     private String orgnizeNamePsnAccount;
     /** 机构经办人名称 */
     private String orgnizeNamepsnName;
+    /** 流程状态 */
+    private Integer signFlowStatus;
+
+    public Integer getSignFlowStatus() {
+        return signFlowStatus;
+    }
+
+    public void setSignFlowStatus(Integer signFlowStatus) {
+        this.signFlowStatus = signFlowStatus;
+    }
 
     public String getFileid() {
         return fileid;

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -96,7 +96,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 caseAffiliate.setCaseAppliId(caseApplication.getId());
                 if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) {
                     // 将组织机构id设为申请人名称
-                    if (deptMap.containsKey(caseApplication.getName())) {
+                    if (deptMap.containsKey(caseAffiliate.getName())) {
                         caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName())));
                     } else {
                         // 如果不存在则新增