Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
online-edu-backend
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
online-edu
online-edu-backend
Commits
dcfd0e96
Commit
dcfd0e96
authored
May 19, 2021
by
liuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed 企业列表保存时管理员默认为未激活状态
parent
bb85ec8d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
OrganizationService.java
...om/qkdata/biz/management/service/OrganizationService.java
+2
-0
SysUserService.java
src/main/java/com/qkdata/biz/sys/service/SysUserService.java
+1
-1
No files found.
src/main/java/com/qkdata/biz/management/service/OrganizationService.java
View file @
dcfd0e96
...
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.google.common.collect.Lists
;
import
com.qkdata.biz.common.BizConstants
;
import
com.qkdata.biz.enums.AccountStatusEnum
;
import
com.qkdata.biz.enums.AccountTypeEnum
;
import
com.qkdata.biz.enums.OrgTypeEnum
;
import
com.qkdata.biz.management.entity.OrganizationPO
;
...
...
@@ -112,6 +113,7 @@ public class OrganizationService extends BaseServiceImpl<OrganizationMapper, Org
saveModel
.
setName
(
model
.
getAdminName
());
saveModel
.
setEnterpriseId
(
enterpriseId
);
saveModel
.
setType
(
AccountTypeEnum
.
USER
);
saveModel
.
setStatus
(
AccountStatusEnum
.
UNACTIVATE
);
List
<
String
>
roleCodeList
=
Lists
.
newArrayList
(
BizConstants
.
ROLE_ENTERPRISE_ADMIN
);
saveModel
.
setRoleCodeList
(
roleCodeList
);
memberService
.
save
(
saveModel
);
...
...
src/main/java/com/qkdata/biz/sys/service/SysUserService.java
View file @
dcfd0e96
...
...
@@ -68,7 +68,7 @@ public class SysUserService extends BaseServiceImpl<SysUserMapper, SysUserPO> {
po
.
setSalt
(
RandomStringUtils
.
randomAlphanumeric
(
20
));
po
.
setPassword
(
new
Sha256Hash
(
sysUserModel
.
getPassword
(),
po
.
getSalt
()).
toHex
());
po
.
setLastLoginTime
(
LocalDateTime
.
now
());
po
.
setStatus
(
AccountStatusEnum
.
ENABL
E
);
po
.
setStatus
(
sysUserModel
.
getStatus
()
!=
null
?
sysUserModel
.
getStatus
()
:
AccountStatusEnum
.
UNACTIVAT
E
);
save
(
po
);
List
<
Long
>
roleIds
=
null
;
if
(
CollUtil
.
isNotEmpty
(
sysUserModel
.
getRoleIdList
())){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment