|
|
@@ -114,6 +114,11 @@ public class KwsUserService {
|
|
|
/*存用户表、企业表，暂时不处理角色关系，需要认证*/
|
|
|
KwsUser kwsUser = new KwsUser();
|
|
|
long userId = new IdWorker(1).nextId();
|
|
|
+ Long createBy = userId;
|
|
|
+ if (Objects.nonNull(LoginUserHolder.getUserId()) && LoginUserHolder.getUserId().compareTo(1L) != 0) {
|
|
|
+ createBy = LoginUserHolder.getUserId();
|
|
|
+ }
|
|
|
+
|
|
|
kwsUser.setSystemType(reqDto.getSystemType());
|
|
|
kwsUser.setAccount(reqDto.getPhone());
|
|
|
kwsUser.setPassword(reqDto.getPassword());
|
|
|
@@ -121,10 +126,8 @@ public class KwsUserService {
|
|
|
kwsUser.setPhone(reqDto.getPhone());
|
|
|
kwsUser.setIsMain(reqDto.getIsMain());
|
|
|
kwsUser.setId(userId);
|
|
|
- if (Objects.isNull(LoginUserHolder.getUserId()) || LoginUserHolder.getUserId().compareTo(1L) == 0) {
|
|
|
- kwsUser.setCreateBy(userId);
|
|
|
- kwsUser.setUpdateBy(userId);
|
|
|
- }
|
|
|
+ kwsUser.setCreateBy(createBy);
|
|
|
+ kwsUser.setUpdateBy(createBy);
|
|
|
//填充密码、入库
|
|
|
fillPassword(kwsUser);
|
|
|
if (kwsUserDao.insert(kwsUser) <= 0) {
|
|
|
@@ -146,8 +149,9 @@ public class KwsUserService {
|
|
|
kwsEnterprise.setApproval(ApprovalEnum.NO.getCode());
|
|
|
kwsEnterprise.setContacts(reqDto.getName());
|
|
|
kwsEnterprise.setPhone(reqDto.getPhone());
|
|
|
- kwsEnterprise.setCreateBy(userId);
|
|
|
- kwsEnterprise.setUpdateBy(userId);
|
|
|
+ kwsEnterprise.setCreateBy(createBy);
|
|
|
+ kwsEnterprise.setUpdateBy(createBy);
|
|
|
+
|
|
|
registerResDto.setEntId(entId);
|
|
|
if (kwsEnterpriseDao.insert(kwsEnterprise) <= 0) {
|
|
|
throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
|
|
|
@@ -160,8 +164,8 @@ public class KwsUserService {
|
|
|
kwsDept.setName(reqDto.getEntName());
|
|
|
kwsDept.setSystemType(systemType);
|
|
|
kwsDept.setCompany(Global.NO);
|
|
|
- kwsDept.setUpdateBy(userId);
|
|
|
- kwsDept.setCreateBy(userId);
|
|
|
+ kwsDept.setUpdateBy(createBy);
|
|
|
+ kwsDept.setCreateBy(createBy);
|
|
|
kwsDeptService.add(kwsDept);
|
|
|
|
|
|
/*3、绑定用户机构关系*/
|
czh