From 54ee01cb770220fff45678d68785ed1066cb82ca Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Wed, 18 Oct 2023 19:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E6=A1=88?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/CaseApplicationServiceImpl.java | 8 ++++----
.../wisdomarbitrate/CaseApplicationMapper.xml | 17 +++++++++--------
2 files changed, 13 insertions(+), 12 deletions(-)
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 9d5fa5f..a46eb04 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
@@ -397,7 +397,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
agentUser.setNickName(caseAffiliate.getNameAgent());
agentUser.setUserName(caseAffiliate.getIdentityNumAgent());
agentUser.setPhonenumber(caseAffiliate.getContactTelphoneAgent());
- agentUser.setPassword(SecurityUtils.encryptPassword(Constants.DEFAULT_PASSWORD));
+ // agentUser.setPassword(SecurityUtils.encryptPassword(Constants.DEFAULT_PASSWORD));
agentUser.setDeptId(Long.valueOf(caseAffiliate.getApplicationOrganId()));
int insertUserRow = sysUserMapper.insertUser(agentUser);
// 新增角色为申请人
@@ -411,15 +411,15 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
}
if (insertUserRow > 0) {
caseAffiliate.setApplicantAgentUserId(String.valueOf(agentUser.getUserId()));
- // 发送短信 1955400 普通短信 导入后通知申请人认证注册 尊敬的{1},您的申请的仲裁案件已导入，复制访问https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 进入小程序进行认证注册。如非本人操作，请忽略本短信 已生效
+ // 明天改下模板id：1956159 普通短信 通知用户认证注册 尊敬的{1},您的代理的案件已接入仲裁系统，复制访问https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 进入小程序进行认证注册。如非本人操作，请忽略本短信
SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
- request.setTemplateId("1955400");
+ request.setTemplateId("1956159");
request.setPhone(agentUser.getPhonenumber());
request.setTemplateParamSet(new String[]{agentUser.getNickName()});
SmsUtils.sendSms(request);
}
} else if (null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())) {
- return "申请机构与申请代理人不匹配";
+ return "该申请代理人已存在，与申请机构不匹配";
} else if (null != agentUser.getDeptId() && String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())){
// 同步用户表和案件关联人表的手机号和名称
caseAffiliate.setContactTelphoneAgent(agentUser.getPhonenumber());
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
index 6c8ed3a..105cacf 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
@@ -96,18 +96,18 @@
- or (t.identity_num=#{idCard} AND t.identity_type=2 and t.case_status=4)
+ or (t.identity_num=#{idCard} AND t.identity_type=2 and (t.case_status=4 or t.case_status=17))
or ( t.identity_type=1 and
- t.case_status in (7,8,9,12,13,14)
+ t.case_status in (7,8,9,12,13,14,17)
and
instr (t.arbitrator_id,#{userId})>0)
- or (t.identity_type=1 and t.case_status in (1,5,11,15,16)
+ or (t.identity_type=1 and t.case_status in (1,5,11,15,16,17)
and t.application_organ_id in
#{item}
@@ -117,7 +117,7 @@
or ( t.application_organ_id = #{nameId} AND t.identity_type=1
- and t.case_status in (0,2))
+ and t.case_status in (0,2,17))
@@ -132,6 +132,7 @@
+
) t1
@@ -182,18 +183,18 @@
- or (t.identity_num=#{idCard} AND t.identity_type=2 and t.case_status=4)
+ or (t.identity_num=#{idCard} AND t.identity_type=2 and (t.case_status=4 or t.case_status=17))
or ( t.identity_type=1 and
- t.case_status in (7,8,9,12,13,14)
+ t.case_status in (7,8,9,12,13,14,17)
and
instr (t.arbitrator_id,#{userId})>0)
- or (t.identity_type=1 and t.case_status in (1,5,11,15,16)
+ or (t.identity_type=1 and t.case_status in (1,5,11,15,16,17)
and t.application_organ_id in
#{item}
@@ -202,7 +203,7 @@
or ( t.application_organ_id = #{nameId} AND t.identity_type=1
- and t.case_status in (0,2))
+ and t.case_status in (0,2,17))
--
2.54.0