|
@@ -86,6 +86,7 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
|
|
|
userEntity.setCreateTime(DateUtil.date2String(new Date(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
userEntity.setUpdateTime(new Date());
|
|
|
userEntity.setRegisterTime(DateUtil.date2String(new Date(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ userEntity.setRecStatus("A");
|
|
|
userService.save(userEntity);
|
|
|
|
|
|
UserRole userRoleEntity = new UserRole();
|
|
@@ -157,10 +158,12 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
|
|
|
public PageInfo<ResponseCompany> companyList(RequestCompany param) {
|
|
|
MPJLambdaWrapper<Company> wrapper = new MPJLambdaWrapper<Company>()
|
|
|
.selectAll(Company.class)
|
|
|
+ .selectAll(User.class)
|
|
|
.leftJoin(User.class,User::getId,Company::getManagerId);
|
|
|
if(!StringUtils.isEmpty(param.getManagerName())){
|
|
|
wrapper.like(User::getUserName,param.getUserName());
|
|
|
}
|
|
|
+ wrapper.orderByDesc(Company::getCreateTime);
|
|
|
Page<Company> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|
|
|
|
|
|
List<ResponseCompany> list = page.getRecords().stream().map(entity->{
|