|
@@ -593,10 +593,11 @@ public class TBUserController {
|
|
}
|
|
}
|
|
if (Objects.isNull(tbUser.getId())) {
|
|
if (Objects.isNull(tbUser.getId())) {
|
|
TBOrg tbOrg = (TBOrg) ServletUtil.getRequestOrg();
|
|
TBOrg tbOrg = (TBOrg) ServletUtil.getRequestOrg();
|
|
- tbUser.setId(Constants.idGen.next());
|
|
|
|
- if (Objects.nonNull(tbOrg)) {
|
|
|
|
- tbUser.setOrgId(tbOrg.getId());
|
|
|
|
|
|
+ if (Objects.isNull(tbOrg) || Objects.isNull(tbOrg.getId())) {
|
|
|
|
+ throw new BusinessException(ExceptionResultEnum.ORG_ID_IS_NULL);
|
|
}
|
|
}
|
|
|
|
+ tbUser.setId(Constants.idGen.next());
|
|
|
|
+ tbUser.setOrgId(tbOrg.getId());
|
|
tbUser.setCreateId(tbUser.getId());
|
|
tbUser.setCreateId(tbUser.getId());
|
|
if (Objects.nonNull(roleSet) && roleSet.size() > 0) {
|
|
if (Objects.nonNull(roleSet) && roleSet.size() > 0) {
|
|
TBUser finalTbUser = tbUser;
|
|
TBUser finalTbUser = tbUser;
|