From a57f0e5dd38fd96b777f934e87247a9966dbf0a9 Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Thu, 3 Nov 2022 16:23:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=97=A0=E4=BE=9B=E5=BA=94=E5=95=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/RegisterController.java | 44 ++++++++++++------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index 6618294..680085a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -326,24 +326,34 @@ public class RegisterController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - long customerId=Long.valueOf(registerCheckRequest.getCompanyId()); + Long customerId=0L; UserRegisterEntity userRegisterEntity = userRegisterService.selectById(registerCheckRequest.getId()); -// if (StrUtil.isNotBlank(userRegisterEntity.getCompanyId()) && StrUtil.isNotBlank(registerCheckRequest.getCompanyName())) { -// //系统参数设置了 新用户注册时是否根据往来单位字典进行企业名称校验 不校验 -// //根据公司名称查询往来单位信息 -// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(registerCheckRequest.getCompanyName()); -// userId = Long.parseLong(basicUnitMaintainEntity.getErpId()); -// } else { -// if(registerCheckRequest.getCheckType()==1){ -// //注册时新增到往来单位字典 -// BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); -// basicUnitMaintainEntity.setName(userRegisterEntity.getCompanyName()); -// basicUnitMaintainEntity.setErpId(userId+""); -// basicUnitMaintainEntity.setCorpType(2); -// basicUnitMaintainEntity.setOutType(0); -// basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); -// } -// } + //判断是否选择供应商 + if (StrUtil.isBlank(registerCheckRequest.getCompanyId()) && StrUtil.isBlank(registerCheckRequest.getCompanyName())) { + //根据公司名称查询往来单位信息 + BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(userRegisterEntity.getCompanyName()); + //没有就新建 + if (basicUnitMaintainEntity == null) { + if (registerCheckRequest.getCheckType() == 1) { + //注册时新增到往来单位字典 + BasicUnitMaintainEntity basicUnitMaintainEntity1 = new BasicUnitMaintainEntity(); + basicUnitMaintainEntity1.setName(userRegisterEntity.getCompanyName()); + basicUnitMaintainEntity1.setErpId(generateUserId() + ""); + basicUnitMaintainEntity1.setCorpType(2); + basicUnitMaintainEntity1.setOutType(0); + basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity1); + customerId=Long.parseLong(basicUnitMaintainEntity1.getErpId()); + registerCheckRequest.setCompanyId(basicUnitMaintainEntity1.getErpId()); + registerCheckRequest.setCompanyName(basicUnitMaintainEntity1.getName()); + } + }else { + customerId=Long.parseLong(basicUnitMaintainEntity.getErpId()); + registerCheckRequest.setCompanyId(basicUnitMaintainEntity.getErpId()); + registerCheckRequest.setCompanyName(basicUnitMaintainEntity.getName()); + } + }else { + customerId=Long.parseLong(registerCheckRequest.getCompanyId()); + } if(registerCheckRequest.getCheckType()==1){ //通过就更新用户id 供应商用户 供应商id userRegisterEntity.setCompanyId(registerCheckRequest.getCompanyId());