diff --git a/src/main/java/com/dc/dc_project/config/CorsConfig.java b/src/main/java/com/dc/dc_project/config/CorsConfig.java index 074a638..0c49f83 100644 --- a/src/main/java/com/dc/dc_project/config/CorsConfig.java +++ b/src/main/java/com/dc/dc_project/config/CorsConfig.java @@ -14,10 +14,12 @@ public class CorsConfig { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") // 允许所有路径 - .allowedOrigins("http://localhost:8080", // 你的前端开发服务器地址 - "http://localhost:3000", - "http://localhost:8000", - "https://www.yourfrontend.com" ) // 允许的来源(可修改为前端地址) + //.allowedOrigins("http://localhost:8080", + // "http://127.0.0.1:8080", + // "http://localhost:3000", + // "http://localhost:8000", + // "https://www.yourfrontend.com" ) + .allowedOriginPatterns("*") .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") // 允许的请求方法 .allowedHeaders("*") // 允许所有请求头 .allowCredentials(false); // 允许携带 Cookie diff --git a/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java index 17b9f95..2a6bb22 100644 --- a/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java @@ -155,6 +155,12 @@ public class UserServiceImpl extends ServiceImpl if(personnel.getUserId() != null){ return ResponseResult.error("已存在用户账号"); } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(User::getPhone, userDto.getPhone()) + .eq(User::getIsDeleted, 0); + if(baseMapper.exists(queryWrapper)){ + return ResponseResult.error("手机号已存在"); + } if(userDto.getPassword() == null){ userDto.setPassword(userDto.getPhone()); } diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index 80cb686..30757f9 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -73,10 +73,12 @@ AND u.status = #{userReqDto.status} - AND o.id in (#{orgIds}) + o.id in + + #{item} + and u.is_deleted = 0 - limit #{userReqDto.current},#{userReqDto.size}