Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -12,9 +12,9 @@ public interface LauncherConstant {
     /**
      * nacos 命名空间
      */
-	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
+//	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
 	// 生产环境
-//	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
+	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
 	// 测试环境
 //	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
 
@@ -31,8 +31,8 @@ public interface LauncherConstant {
     /**
      * nacos dev 地址
      */
-//    String NACOS_DEV_ADDR = "192.168.249.27:8848";
+    String NACOS_DEV_ADDR = "192.168.249.27:8848";
-    String NACOS_DEV_ADDR = "127.0.0.1:8848";
+//    String NACOS_DEV_ADDR = "127.0.0.1:8848";
 
     /**R
      * nacos prod 地址

blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesNotifyMessageServiceImpl.java

@@ -64,7 +64,7 @@ public class MesNotifyMessageServiceImpl extends BaseServiceImpl<MesNotifyMessag
 			mesNotifyMessageVOList.getRecords().forEach(entity -> {
 				MesNotifyMessageVO mesNotifyMessageVO = new MesNotifyMessageVO();
 				BeanUtils.copyProperties(entity, mesNotifyMessageVO);
-				mesNotifyMessageVO.setCreateUserName(UserCache.getUser(mesNotifyMessageVO.getCreateUser()).getName());
+				mesNotifyMessageVO.setCreateUserName(mesNotifyMessageVO.getCreateUser() == null ? UserCache.getUser(mesNotifyMessageVO.getCreateUser()).getName() : "");
 				mesNotifyMessageList.add(mesNotifyMessageVO);
 			});
 			page1.setRecords(mesNotifyMessageList);