|
@@ -498,13 +498,31 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
// 校验城市
|
|
|
if (StringUtils.isEmpty(province)) {
|
|
|
userDTO.setCity("");
|
|
|
+ userDTO.setProvinceCode("");
|
|
|
+ userDTO.setCityCode("");
|
|
|
} else {
|
|
|
+ String provinceCode = StrUtil.cleanBlank(commonUserDTO.getProvinceCode());
|
|
|
+ if (StringUtils.isEmpty(provinceCode)){
|
|
|
+ log.error("省份编码为空");
|
|
|
+ errorMap(errorMap, "省份编码为空", commonUserDTO.getId());
|
|
|
+ }
|
|
|
+ userDTO.setProvinceCode(provinceCode);
|
|
|
+
|
|
|
String city = StrUtil.cleanBlank(commonUserDTO.getCity());
|
|
|
if (StringUtils.isEmpty(city)) {
|
|
|
log.error("城市为空");
|
|
|
errorMap(errorMap, "城市为空", commonUserDTO.getId());
|
|
|
}
|
|
|
+
|
|
|
userDTO.setCity(city);
|
|
|
+
|
|
|
+ String cityCode = StrUtil.cleanBlank(commonUserDTO.getCityCode());
|
|
|
+ if (StringUtils.isEmpty(cityCode)){
|
|
|
+ log.error("城市编码为空");
|
|
|
+ errorMap(errorMap, "城市编码为空", commonUserDTO.getId());
|
|
|
+ }
|
|
|
+ userDTO.setCityCode(cityCode);
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|