master function为空取name

src/main/java/com/uas/erp/schedular/listen/ListenTask.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.UnsupportedEncodingException;
@@ -94,9 +95,9 @@ public class ListenTask {
                 StringBuilder str = new StringBuilder();
                 for (Master master : masters) {
                     if ("".equals(str.toString())) {
-                        str.append(master.getMa_function());
+                        str.append(StringUtils.isEmpty(master.getMa_function()) ? master.getMa_name() : master.getMa_function());
                     } else {
-                        str.append("、" + master.getMa_function());
+                        str.append("、" + (StringUtils.isEmpty(master.getMa_function()) ? master.getMa_name() : master.getMa_function()));
                     }
                 }
                 ListenDomain listenDomain = new ListenDomain(MACADDRESS,