From de9369d2c8056e2bb723247b0e877fe9d96f8def Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sun, 15 Sep 2024 15:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index f8ac102..1feada6 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -227,6 +227,11 @@
                 caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
                 caseInfo.setCreateTime(nowDate);
                 caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+                //默认添加省市
+                caseInfo.setQueProv("19");
+                caseInfo.setQueProvName("广东省");
+                caseInfo.setQueCity("1601");
+                caseInfo.setQueCityName("广州市");
                 // 删除草稿案件
                 if(1 == registerSaveDTO.getIsDraft() ){
                     draftInfoService.removeDraftInfo(registerSaveDTO.getId());
@@ -243,7 +248,7 @@
                 // 判断是否自行受理
                 if(1 == registerSaveDTO.getIsSelfAccept()){
                     // 自行受理流程
-                    caseTaskService.webStartFlowZXSL(caseInfo, loginUser);
+                     return caseTaskService.webStartFlowZXSL(caseInfo, loginUser);
                 }else {
                     // 自动调度流程
                     caseTaskService.webStartFlowLFDJ(caseInfo);
@@ -561,6 +566,12 @@
         caseInfo.setInputUserId(loginUser.getId());
         caseInfo.setInputUserName(loginUser.getTrueName());
         caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
+        //默认添加省市
+        caseInfo.setQueProv("19");
+        caseInfo.setQueProvName("广东省");
+        caseInfo.setQueCity("1601");
+        caseInfo.setQueCityName("广州市");
+
         caseInfo.setCreateTime(nowDate);
         caseInfo.setUpdateTime(nowDate);
         caseInfo.setVisitTime(nowDate);

--
Gitblit v1.8.0