修复新用户审批无供应商自动创建

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())) {
+        //判断是否选择供应商
-//            //系统参数设置了 新用户注册时是否根据往来单位字典进行企业名称校验  不校验
+        if (StrUtil.isBlank(registerCheckRequest.getCompanyId()) && StrUtil.isBlank(registerCheckRequest.getCompanyName())) {
-//            //根据公司名称查询往来单位信息
+            //根据公司名称查询往来单位信息
-//            BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(registerCheckRequest.getCompanyName());
+            BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(userRegisterEntity.getCompanyName());
-//            userId = Long.parseLong(basicUnitMaintainEntity.getErpId());
+            //没有就新建
-//        } else {
+            if (basicUnitMaintainEntity == null) {
-//            if(registerCheckRequest.getCheckType()==1){
+                if (registerCheckRequest.getCheckType() == 1) {
-//                //注册时新增到往来单位字典
+                    //注册时新增到往来单位字典
-//                BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
+                    BasicUnitMaintainEntity basicUnitMaintainEntity1 = new BasicUnitMaintainEntity();
-//                basicUnitMaintainEntity.setName(userRegisterEntity.getCompanyName());
+                    basicUnitMaintainEntity1.setName(userRegisterEntity.getCompanyName());
-//                basicUnitMaintainEntity.setErpId(userId+"");
+                    basicUnitMaintainEntity1.setErpId(generateUserId() + "");
-//                basicUnitMaintainEntity.setCorpType(2);
+                    basicUnitMaintainEntity1.setCorpType(2);
-//                basicUnitMaintainEntity.setOutType(0);
+                    basicUnitMaintainEntity1.setOutType(0);
-//                basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
+                    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());