diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java index ab2edd8..c7b0c6f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java @@ -187,21 +187,25 @@ public class UserService extends ServiceImpl implements AddUserParam addUserParam = BeanUtil.copyProperties(userRegisterParam, AddUserParam.class); addUserParam.setAccount(BeanUtil.copyProperties(account, AddUserAccountParam.class)); Long userId = this.add(addUserParam); - MoneyAccountEntity entity = new MoneyAccountEntity(); // if (bizObj == BizObj.GeRen) { // entity.setUserId(userId); // moneyAccountService.add(entity); // return; // } - UserRegisterParam.Company company = userRegisterParam.getCompany(); - Assert.notNull(company, "公司信息不能为空"); + Long companyId = null; + if (!bizObj.isWastePersonal()) { + UserRegisterParam.Company company = userRegisterParam.getCompany(); + Assert.notNull(company, "公司信息不能为空"); + AddBizCompanyParam addBizCompanyParam = BeanUtil + .copyProperties(company, AddBizCompanyParam.class) + .setUserId(userId); + companyId = bizCompanyService.add(addBizCompanyParam); + } + - AddBizCompanyParam addBizCompanyParam = BeanUtil - .copyProperties(company, AddBizCompanyParam.class) - .setUserId(userId); - Long companyId = bizCompanyService.add(addBizCompanyParam); // 添加账户信息 if (bizObj.isTrans()) { + MoneyAccountEntity entity = new MoneyAccountEntity(); entity.setStationId(companyId); moneyAccountService.add(entity); }