Merge branch 'master' into dev

src/main/java/com/uas/platform/b2c/common/message/controller/InternalMessageController.java

@@ -7,6 +7,7 @@ import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.message.service.InternalMessageService;
 import com.uas.platform.b2c.core.config.MessageConf;
 import com.uas.platform.b2c.core.support.SystemSession;
+import com.uas.platform.b2c.fa.payment.utils.StringUtils;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.HttpUtil;
@@ -61,7 +62,9 @@ public class InternalMessageController {
         User user = SystemSession.getUser();
         map.put("url", messageServiceUrl);
         map.put("userUU", user.getUserUU());
-        map.put("enUU", user.getEnterprise().getUu());
+        if (!org.springframework.util.StringUtils.isEmpty(user.getEnterprise())) {
+            map.put("enUU", user.getEnterprise().getUu());
+        }
         map.put("page", pageParams.getPage());
         map.put("timeSorting", pageParams.getSorting() == null ? "{\"createTime\":\"DESC\"}" : pageParams.getSorting());
         map.put("count", pageParams.getCount());