Merge branch 'develop_tzs_test' into develop_tzs_register

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -56,11 +56,14 @@ public class MetaHandler implements MetaObjectHandler {
 
     private void recUserNameSave(MetaObject metaObject) {
         String userName = this.getRealNameFromLoginInfo();
-        this.setFieldValByName("recUserName", userName, metaObject);
+        if(StringUtils.isNotEmpty(userName)){
+            this.setFieldValByName("recUserName", userName, metaObject);
+        }
     }
 
     private String getRealNameFromLoginInfo() {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        Object redisUserData = redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
+        ReginParams reginParams = JSONObject.parseObject(Optional.ofNullable(redisUserData).map(Object::toString).orElse(null), ReginParams.class);
         return Optional.ofNullable(reginParams).map(ReginParams::getUserModel).map(AgencyUserModel::getRealName).orElse("");
     }