diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java index ff1a63c..de67c09 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java @@ -25,7 +25,6 @@ public class UserAddCmd extends Command { private String userId; @ApiModelProperty(value = "登录账号", name = "username", required = true) - @NotEmpty(message = "登录账号不能为空") private String username; @ApiModelProperty(value = "姓名", name = "name", required = true) @@ -60,11 +59,9 @@ public class UserAddCmd extends Command { private String phone; @ApiModelProperty(value = "人员类型编码(主要负责人等)", name = "personnelType", required = true) - @NotEmpty(message = "人员类型不能为空") private String personnelType; @ApiModelProperty(value = "人员类型翻译", name = "personnelTypeName", required = true) - @NotEmpty(message = "人员类型不能为空") private String personnelTypeName; @ApiModelProperty(value = "民族编码", name = "nation") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java index bff1ff9..633b8d2 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java @@ -25,7 +25,6 @@ public class UserXgfAddCmd extends Command { private String userId; @ApiModelProperty(value = "登录账号", name = "username", required = true) - @NotEmpty(message = "登录账号不能为空") private String username; @ApiModelProperty(value = "姓名", name = "name", required = true) diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 931c412..8371ac6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -37,6 +37,7 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; +import org.springframework.util.StringUtils; import java.util.Collections; import java.util.HashMap; @@ -195,6 +196,9 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i @Override public void saveUser(UserDO userDO) { + if(StringUtils.isEmpty(userDO.getUsername())){ + userDO.setUsername(userDO.getPhone()); + } UserAddCmd userAddCmd = new UserAddCmd(); userAddCmd.setAccount(userDO.getUsername()); userAddCmd.setName(userDO.getName());