Compare commits
No commits in common. "4b3d77b152c02090125e3906a03450faf7cfdab2" and "55efc16afeb0c8a3b7520ee181650fb68be07b5b" have entirely different histories.
4b3d77b152
...
55efc16afe
|
|
@ -188,11 +188,11 @@ public class UserService extends ServiceImpl<UserMapper, UserEntity> implements
|
||||||
addUserParam.setAccount(BeanUtil.copyProperties(account, AddUserAccountParam.class));
|
addUserParam.setAccount(BeanUtil.copyProperties(account, AddUserAccountParam.class));
|
||||||
Long userId = this.add(addUserParam);
|
Long userId = this.add(addUserParam);
|
||||||
MoneyAccountEntity entity = new MoneyAccountEntity();
|
MoneyAccountEntity entity = new MoneyAccountEntity();
|
||||||
// if (bizObj == BizObj.GeRen) {
|
if (bizObj == BizObj.GeRen) {
|
||||||
// entity.setUserId(userId);
|
entity.setUserId(userId);
|
||||||
// moneyAccountService.add(entity);
|
moneyAccountService.add(entity);
|
||||||
// return;
|
return;
|
||||||
// }
|
}
|
||||||
UserRegisterParam.Company company = userRegisterParam.getCompany();
|
UserRegisterParam.Company company = userRegisterParam.getCompany();
|
||||||
Assert.notNull(company, "公司信息不能为空");
|
Assert.notNull(company, "公司信息不能为空");
|
||||||
|
|
||||||
|
|
@ -201,11 +201,9 @@ public class UserService extends ServiceImpl<UserMapper, UserEntity> implements
|
||||||
.setUserId(userId);
|
.setUserId(userId);
|
||||||
Long companyId = bizCompanyService.add(addBizCompanyParam);
|
Long companyId = bizCompanyService.add(addBizCompanyParam);
|
||||||
// 添加账户信息
|
// 添加账户信息
|
||||||
if (bizObj.isTrans()) {
|
|
||||||
entity.setStationId(companyId);
|
entity.setStationId(companyId);
|
||||||
moneyAccountService.add(entity);
|
moneyAccountService.add(entity);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改密码
|
* 修改密码
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue