报聘后短信内容问题修复

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java

@@ -821,49 +821,50 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         List<String> mobileNoList = new ArrayList<>(3);
         mobileNoList.add(basicInfo.getMobileNo());
 
+        // 发给报聘人的短信模板
         String name = basicInfo.getName();
         Map<String,List<String>> smsParam = new HashMap<>();
-        List<String> list = new ArrayList<>();
-        list.add(systemConfigService.getSingleConfigValue("ALI_SMS_CONTRACT_3"));
-        list.add("{\"name\":\""+name+"\"}");
-        smsParam.put(basicInfo.getMobileNo(), list);
+        List<String> list1 = new ArrayList<>();
+        list1.add(systemConfigService.getSingleConfigValue("ALI_SMS_CONTRACT_3"));
+        list1.add("{\"name\":\"" + name + "\"}");
+        smsParam.put(basicInfo.getMobileNo(), list1);
 
+        // 发给辅导人和体系负责人的短信模板
+        String system = memberShip.getSubsystem();
         if (memberShip.getMentorPractitionerId() != null) {
             AclPractitioner mentor = aclPractitionerMapper.selectByPrimaryKey(memberShip.getMentorPractitionerId());
             mobileNoList.add(mentor.getMobileNo());
+
+            List<String> list2 = new ArrayList<>();
+            list2.add(systemConfigService.getSingleConfigValue("ALI_SMS_CONTRACT"));
+            list2.add("{\"system\":\"" + system + "\",\"name\":\"" + name + "\"}");
+            smsParam.put(mentor.getMobileNo(), list2);
         }
 
         if (memberShip.getApprovedBy() != null) {
-            AclPractitioner system = aclPractitionerMapper.selectByPrimaryKey(memberShip.getApprovedBy());
-            mobileNoList.add(system.getMobileNo());
+            AclPractitioner systemLeader = aclPractitionerMapper.selectByPrimaryKey(memberShip.getApprovedBy());
+            mobileNoList.add(systemLeader.getMobileNo());
+
+            List<String> list3 = new ArrayList<>();
+            list3.add(systemConfigService.getSingleConfigValue("ALI_SMS_CONTRACT"));
+            list3.add("{\"system\":\"" + system + "\",\"name\":\"" + name + "\"}");
+            smsParam.put(systemLeader.getMobileNo(), list3);
         }
         // 若辅导人和团队长为同一人，去重
         List<String> uniqueList = mobileNoList.stream().distinct().collect(Collectors.toList());
 
-        String system = memberShip.getSubsystem();
         String mobileNo;
         String templateCode;
         String content;
-        // S2的短信模板
-        if (Long.valueOf("30").equals(memberShip.getMdDropOptionId())) {
-            /* 短信提醒 */
-            templateCode = systemConfigService.getSingleConfigValue("ALI_SMS_CONTRACT_S2");
-            content = "{\"name\":\""+name+"\"}";
-
-        } else {
-            /* 短信提醒 */
-            templateCode = systemConfigService.getSingleConfigValue("ALI_SMS_CONTRACT");
-            content = "{\"system\":\""+system+"\",\"name\":\""+name+"\"}";
-        }
         for (int i = 0; i < uniqueList.size(); i++) {
 
             mobileNo = uniqueList.get(i);
             if(smsParam.get(mobileNo) != null && smsParam.get(mobileNo).size() > 1){
                 templateCode = smsParam.get(mobileNo).get(0);
                 content = smsParam.get(mobileNo).get(1);
-            }
-            sendService.sendEmailOrSMS("sms", mobileNo, "0", content, templateCode, null, null, "电子报聘合同生成提醒", 99, hiringBasicInfoId);
 
+                sendService.sendEmailOrSMS("sms", mobileNo, "0", content, templateCode, null, null, "电子报聘合同生成提醒", 99, hiringBasicInfoId);
+            }
         }
     }