Merge branch 'dev' into test

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -53,6 +53,9 @@ public class AdamUserController {
     @Autowired
     IAdamUserInfoService adamUserInfoService;
 
+    private static final String avatarDefUrl = "https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png";
+    private static final String backgroundDefUrl = "https://img.zhengzai.tv/other/2021/07/27/150eeb0e20af4fc88e8a1ec57c46c362.png";
+
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "资料编辑")
     @PostMapping(value = {"edit"})
@@ -119,8 +122,10 @@ public class AdamUserController {
         String currentUid = CurrentUtil.getCurrentUid();
 
         AdamUserInfoVo editVo = adamRdmService.getUserInfoVoByUid(currentUid);
-        editVo.setAvatar(parameter.getAvatar());
-        editVo.setBackground(parameter.getBackground());
+//        editVo.setAvatar(parameter.getAvatar());
+//        editVo.setBackground(parameter.getBackground());
+        editVo.setAvatar(StringUtils.isEmpty(editVo.getAvatar()) ? avatarDefUrl : editVo.getAvatar());
+        editVo.setBackground(StringUtils.isEmpty(editVo.getBackground()) ? avatarDefUrl : editVo.getBackground());
         editVo.setNickname(parameter.getNickname());
         editVo.setSex(sex);
         editVo.setBirthday(parameter.getBirthday());