值班列表bug解决

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/duty/service/impl/DutyServiceImpl.java

@@ -855,7 +855,7 @@ public class DutyServiceImpl extends ServiceImpl<DutyDao, TSysDuty> implements D
                 List<Person> collect1 = people.stream()
                         .sorted(
                                 Comparator.comparing(Person::getCreateDate)
-                                        .thenComparing(Person::getSort)  // 新增sort升序排序
+                                        .thenComparing(Person::getSort,Comparator.nullsLast(Comparator.naturalOrder()))  // 新增sort升序排序
                                         .thenComparing(Person::getId)
 
                         )

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/globalAlarm/controller/ClobalJeeStudio.java

@@ -20,6 +20,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import io.minio.MinioClient;
 import io.minio.PutObjectArgs;
 import io.minio.errors.*;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -38,6 +39,7 @@ import java.util.*;
 
 //@RestController
 //@RequestMapping("/global")
+@Slf4j
 @Service
 public class ClobalJeeStudio {
 
@@ -321,7 +323,12 @@ public class ClobalJeeStudio {
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
         HttpEntity httpEntity = new HttpEntity(null, headers);        //构建请求参数
+        log.info("httpEntity------->"+httpEntity);
+        log.info("alaremurl------->"+alaremurl);
+        log.info("params------->"+params);
         Map map = restTemplate.postForObject(alaremurl, httpEntity, Map.class, params);
+        log.info("map------->"+map);
+        if(null !=map){
             Integer code = (Integer) map.get("code");
             String token = (String) map.get("token");
             if (code == 0) {
@@ -330,4 +337,6 @@ public class ClobalJeeStudio {
                 throw new BusinessException("登录错误");
             }
         }
+
+    }
 }