Commit dcfd0e96 authored by liuyang's avatar liuyang

fixed 企业列表保存时管理员默认为未激活状态

parent bb85ec8d
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.qkdata.biz.common.BizConstants; import com.qkdata.biz.common.BizConstants;
import com.qkdata.biz.enums.AccountStatusEnum;
import com.qkdata.biz.enums.AccountTypeEnum; import com.qkdata.biz.enums.AccountTypeEnum;
import com.qkdata.biz.enums.OrgTypeEnum; import com.qkdata.biz.enums.OrgTypeEnum;
import com.qkdata.biz.management.entity.OrganizationPO; import com.qkdata.biz.management.entity.OrganizationPO;
...@@ -112,6 +113,7 @@ public class OrganizationService extends BaseServiceImpl<OrganizationMapper, Org ...@@ -112,6 +113,7 @@ public class OrganizationService extends BaseServiceImpl<OrganizationMapper, Org
saveModel.setName(model.getAdminName()); saveModel.setName(model.getAdminName());
saveModel.setEnterpriseId(enterpriseId); saveModel.setEnterpriseId(enterpriseId);
saveModel.setType(AccountTypeEnum.USER); saveModel.setType(AccountTypeEnum.USER);
saveModel.setStatus(AccountStatusEnum.UNACTIVATE);
List<String> roleCodeList = Lists.newArrayList(BizConstants.ROLE_ENTERPRISE_ADMIN); List<String> roleCodeList = Lists.newArrayList(BizConstants.ROLE_ENTERPRISE_ADMIN);
saveModel.setRoleCodeList(roleCodeList); saveModel.setRoleCodeList(roleCodeList);
memberService.save(saveModel); memberService.save(saveModel);
......
...@@ -68,7 +68,7 @@ public class SysUserService extends BaseServiceImpl<SysUserMapper, SysUserPO> { ...@@ -68,7 +68,7 @@ public class SysUserService extends BaseServiceImpl<SysUserMapper, SysUserPO> {
po.setSalt(RandomStringUtils.randomAlphanumeric(20)); po.setSalt(RandomStringUtils.randomAlphanumeric(20));
po.setPassword(new Sha256Hash(sysUserModel.getPassword(), po.getSalt()).toHex()); po.setPassword(new Sha256Hash(sysUserModel.getPassword(), po.getSalt()).toHex());
po.setLastLoginTime(LocalDateTime.now()); po.setLastLoginTime(LocalDateTime.now());
po.setStatus(AccountStatusEnum.ENABLE); po.setStatus(sysUserModel.getStatus() != null ? sysUserModel.getStatus() : AccountStatusEnum.UNACTIVATE);
save(po); save(po);
List<Long> roleIds = null; List<Long> roleIds = null;
if (CollUtil.isNotEmpty(sysUserModel.getRoleIdList())){ if (CollUtil.isNotEmpty(sysUserModel.getRoleIdList())){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment