|
|
|
@ -23,6 +23,7 @@ import com.glxp.api.common.res.BaseResponse;
|
|
|
|
|
import com.glxp.api.common.util.ResultVOUtils;
|
|
|
|
|
import com.glxp.api.entity.auth.UserPersonEntity;
|
|
|
|
|
import com.glxp.api.entity.auth.UserRegisterEntity;
|
|
|
|
|
import com.glxp.api.req.auth.UserRegisterFilterRequest;
|
|
|
|
|
import com.glxp.api.service.auth.UserPersonService;
|
|
|
|
|
import com.glxp.api.service.auth.UserRegisterService;
|
|
|
|
|
import com.glxp.api.util.CaptchaUtils;
|
|
|
|
@ -86,7 +87,7 @@ public class RegisterController {
|
|
|
|
|
}
|
|
|
|
|
UserRegisterEntity userRegisterEntity2 = userRegisterService.selectByCompanyName(userRegisterEntity.getCompanyName());
|
|
|
|
|
if (userRegisterEntity2 !=null ) {
|
|
|
|
|
if(StringUtils.isEmpty(userRegisterEntity.getId()))
|
|
|
|
|
if(userRegisterEntity.getId()==null)
|
|
|
|
|
return ResultVOUtils.error(500, "该单位已被注册!");
|
|
|
|
|
if(!userRegisterEntity2.getId().equals(userRegisterEntity.getId()))
|
|
|
|
|
return ResultVOUtils.error(500, "该单位已被注册!");
|
|
|
|
@ -94,7 +95,7 @@ public class RegisterController {
|
|
|
|
|
if(StringUtils.isEmpty(userRegisterEntity.getCheckStatus()))
|
|
|
|
|
userRegisterEntity.setCheckStatus("0");
|
|
|
|
|
boolean b = false;
|
|
|
|
|
if(!StringUtils.isEmpty(userRegisterEntity.getId())) {
|
|
|
|
|
if(userRegisterEntity.getId()==null) {
|
|
|
|
|
b = userRegisterService.updateUserRegister(userRegisterEntity);
|
|
|
|
|
} else {
|
|
|
|
|
b = userRegisterService.insertUserRegister(userRegisterEntity);
|
|
|
|
@ -108,7 +109,7 @@ public class RegisterController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@GetMapping("/admin/auth/register/list")
|
|
|
|
|
public BaseResponse list(UserResisterFilterRequest userResisterFilterRequest, BindingResult bindingResult) {
|
|
|
|
|
public BaseResponse list(UserRegisterFilterRequest userResisterFilterRequest, BindingResult bindingResult) {
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|