Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

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

@@ -2342,8 +2342,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
         for (CaseAffiliate caseAffiliate : caseAffiliates) {
             request.setPhone(caseAffiliate.getContactTelphone());
-            request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + caseAffiliate.getUserId()});
-            String userId = (null == caseAffiliate.getUserId() ? "" : caseAffiliate.getUserId());
             //  1983711 开庭审理预约会议短信通知  尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，会议时间为{4}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。
             request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() , startFormat + "-" + endFormat});
 

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml

@@ -42,14 +42,11 @@
         c.contact_address,c.work_address,c.work_telphone ,c.name_agent,c.identity_num_agent,c.contact_telphone_agent,
         c.comp_legal_person,c.comp_legalper_post,c.respon_sex ,c.respon_birth,
         c.residen_affili,appli_agent_title,
-        c.contact_address_agent,c.email, c.send_email,c.track_num,c.applicant_agent_user_id,c.agent_email,s.user_id
+        c.contact_address_agent,c.email, c.send_email,c.track_num,c.applicant_agent_user_id,c.agent_email
         from case_affiliate c
-        left JOIN  (
-        SELECT phonenumber,user_id, ROW_NUMBER() OVER(PARTITION BY phonenumber ORDER BY user_id ASC) as rn
-        FROM sys_user
-        ) s  ON c.contact_telphone = s.phonenumber
+
         WHERE
-        s.rn = 1
+
 
         <if test="caseAppliId != null ">
             AND c.case_appli_id = #{caseAppliId}
@@ -62,14 +59,10 @@
         c.contact_address,c.work_address,c.work_telphone ,c.name_agent,c.identity_num_agent,c.contact_telphone_agent,
         c.comp_legal_person,c.comp_legalper_post,c.respon_sex ,c.respon_birth,
         c.residen_affili,appli_agent_title,
-        c.contact_address_agent,c.email, c.send_email,c.track_num,c.applicant_agent_user_id,c.agent_email,s.user_id
+        c.contact_address_agent,c.email, c.send_email,c.track_num,c.applicant_agent_user_id,c.agent_email
         from case_affiliate c
-        left JOIN  (
-        SELECT phonenumber,user_id, ROW_NUMBER() OVER(PARTITION BY phonenumber ORDER BY user_id ASC) as rn
-        FROM sys_user
-        ) s  ON c.contact_telphone = s.phonenumber
+
         WHERE
-        s.rn = 1
         <if test="ids != null ">
                 and case_appli_id in
                 <foreach collection="ids" item="item" open="(" separator="," close=")">