From 74d80f67e70666dbd38b1f0b5e4c0c7772fa5b8c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 九月 2023 15:03:50 +0800
Subject: [PATCH] 休bug
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 8f6815e..f1427f5 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.biz.system.SystemDictBiz;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -18,15 +17,12 @@
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.dto.CompanyCreatOrUpdateRequest;
-import com.doumee.dao.system.SystemDictMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.SystemUserRoleMapper;
-import com.doumee.dao.system.model.SystemDict;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.model.SystemUserRole;
import com.doumee.service.business.CompanyService;
-import com.doumee.service.system.SystemDictService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
@@ -118,7 +114,7 @@
insert.setStatus(Constants.ZERO);
companyMapper.insert(insert);
//鍒涘缓浼佷笟鐢ㄦ埛
- SystemUser companyUser = createCompanyUser(company.getManagerUserName(), insert.getId());
+ SystemUser companyUser = createCompanyUser(company, insert.getId());
Company update = new Company();
update.setId(insert.getId());
update.setManagerId(companyUser.getId());
@@ -137,13 +133,13 @@
return company.getId();
}
- private SystemUser createCompanyUser(String managerUserName,Integer companyId){
+ private SystemUser createCompanyUser(CompanyCreatOrUpdateRequest company, Integer companyId){
QueryWrapper<SystemUser> query = new QueryWrapper<>();
query.lambda()
.eq(SystemUser::getType,Constants.ONE)
.eq(SystemUser::getDeleted,Boolean.FALSE)
- .eq(SystemUser::getUsername,managerUserName);
+ .eq(SystemUser::getUsername,company.getManagerUserName());
Integer integer = systemUserMapper.selectCount(query);
if (integer > Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璐﹀彿宸插瓨鍦ㄨ閲嶆柊杈撳叆璐﹀彿");
@@ -153,10 +149,12 @@
SystemDictData dictDataPassword = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.DEFAULT_PASSWORD);
String salt = RandomStringUtils.randomAlphabetic(6);
SystemUser user = new SystemUser();
- user.setUsername(managerUserName);
+ user.setUsername(company.getManagerUserName());
user.setPassword(Utils.Secure.encryptPassword(dictDataPassword.getCode(), salt));
user.setSalt(salt);
user.setCompanyId(companyId);
+ user.setMobile(company.getLinkephone());
+ user.setRealname(company.getLinkname());
user.setType(Constants.ONE);
user.setCreateTime(new Date());
user.setUpdateTime(new Date());
@@ -302,7 +300,8 @@
.like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,pageWrap.getModel().getStatus())
.between((Objects.nonNull(pageWrap.getModel().getOepnValidDateStart()) && Objects.nonNull(pageWrap.getModel().getOepnValidDateEnd())),
- Company::getOepnValidDate,pageWrap.getModel().getOepnValidDateStart(),pageWrap.getModel().getOepnValidDateEnd());
+ Company::getOepnValidDate,pageWrap.getModel().getOepnValidDateStart(),pageWrap.getModel().getOepnValidDateEnd())
+ .orderByDesc(Company::getCreateTime);
return PageData.from(companyJoinMapper.selectJoinPage(page,Company.class,queryWrapper));
}
--
Gitblit v1.9.3