licailing 4 سال پیش
والد
کامیت
d2d0045f0d
1فایلهای تغییر یافته به همراه10 افزوده شده و 2 حذف شده
  1. 10 2
      src/main/java/com/izouma/wenlvju/service/RateService.java

+ 10 - 2
src/main/java/com/izouma/wenlvju/service/RateService.java

@@ -2,6 +2,7 @@ package com.izouma.wenlvju.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.kevinsawicki.http.HttpRequest;
 import com.izouma.wenlvju.config.DateConfig;
 import com.izouma.wenlvju.domain.*;
@@ -74,6 +75,9 @@ public class RateService {
                     break;
                 case REVIEW_PENDING: // 分配专家组 3
                     // 发送给专家组长和组员
+                    if (ObjectUtil.isEmpty(orig.getExpertUserId()) || CollUtil.isEmpty(orig.getExpertMemberUserId())) {
+                        throw new BusinessException("专家组长或组员不能为空");
+                    }
                     Map<String, String> map = this.reviewTimesMessage(orig);
                     njwlSmsService.sendSms(map.get("phone"), map.get("message"));
                     njwlSmsService.sendSms(map.get("phone1"), map.get("message1"));
@@ -158,7 +162,7 @@ public class RateService {
                 break;
             case REVIEW_DENY:
                 String phone = userRepo.findAllByDistrictAndAuthoritiesContainsAndDelFalse(rate.getDistrict(), Authority
-                        .get(AuthorityName.ROLE_DISTRICT_STAFF))
+                                .get(AuthorityName.ROLE_DISTRICT_STAFF))
                         .stream()
                         .map(User::getPhone)
                         .collect(Collectors.joining(","));
@@ -508,7 +512,11 @@ public class RateService {
             sb.append(user1.getNickname()).append("-").append(user1.getPhone()).append("、");
             System.out.println(sb);
         });
-        String str = sb.substring(0, sb.length() - 1);
+        String str = "";
+        if (StrUtil.isNotEmpty(sb)) {
+            str = sb.substring(0, sb.length() - 1);
+        }
+
         String date = dtf.format(rate.getReviewStartTime()) + " 至 " + dtf.format(rate.getReviewEndTime());
 
         String body = String.format(message, rate.getName(), rate.getDetailAddress(), rate.getOwner(), rate.getOwnerPhone(), date, user