From 2e3112d17b4ff529a17043d2ee4cadec78f62e14 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 21 一月 2025 16:01:20 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java
index 22bd4ca..5aafdb2 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java
@@ -33,26 +33,39 @@
public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
private final UserService userService;
private final HttpServletResponse response;
+
/**
* 获取企业列表
+ *
* @param query
* @return
*/
@Override
public PageDTO<MgtCompanyVO> queryPage(MgtCompanyQuery query) {
Page<Company> page = this.lambdaQuery()
- .like(StringUtils.isNotBlank(query.getCompanyInfo()), Company::getCompanyName, query.getCompanyInfo())
- .like(StringUtils.isNotBlank(query.getCompanyInfo()), Company::getSocialCode, query.getCompanyInfo())
- .like(StringUtils.isNotBlank(query.getLegalPersonInfo()), Company::getLegalPersonName, query.getLegalPersonInfo())
- .like(StringUtils.isNotBlank(query.getLegalPersonInfo()), Company::getIdCardNumber, query.getLegalPersonInfo())
- .like(StringUtils.isNotBlank(query.getContactInfo()), Company::getContactName, query.getContactInfo())
- .like(StringUtils.isNotBlank(query.getContactInfo()), Company::getContactPhone, query.getContactInfo())
+ .and(StringUtils.isNotBlank(query.getCompanyInfo()),
+ queryWrapper -> queryWrapper
+ .like(Company::getCompanyName, query.getCompanyInfo())
+ .or()
+ .like(Company::getSocialCode, query.getCompanyInfo()))
+ .and(StringUtils.isNotBlank(query.getLegalPersonInfo()),
+ queryWrapper -> queryWrapper
+ .like(Company::getLegalPersonName, query.getLegalPersonInfo())
+ .or()
+ .like(Company::getIdCardNumber, query.getLegalPersonInfo()))
+ .and(StringUtils.isNotBlank(query.getContactInfo()),
+ queryWrapper -> queryWrapper
+ .like(Company::getContactName, query.getContactInfo())
+ .or()
+ .like(Company::getContactPhone, query.getContactInfo()))
+ .orderByDesc(Company::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
return PageDTO.of(page,MgtCompanyVO.class);
}
/**
* 获取企业详情
+ *
* @param id
* @return
*/
@@ -74,6 +87,7 @@
/**
* 新增企业
+ *
* @param dto
* @return
*/
@@ -101,11 +115,12 @@
/**
* 编辑企业
+ *
* @param dto
*/
@Override
public void editCompany(MgtCompanyDTO dto) {
- if (Objects.isNull(dto.getId())){
+ if (Objects.isNull(dto.getId())) {
throw new ServiceException("企业id不能为空");
}
//查询企业
@@ -124,14 +139,14 @@
}
//用户信息
User userUpd = BeanUtils.copyBean(dto, User.class);
- if (StringUtils.isNotBlank(dto.getPassword())){
+ if (StringUtils.isNotBlank(dto.getPassword())) {
userUpd.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
}
userUpd.setUserId(user.getUserId());
userUpd.setUpdateBy(SecurityUtils.getUserId());
userService.updateById(userUpd);
//根据公司名称查询数据库
- Long count = this.lambdaQuery().ne(Company::getId,dto.getId()).eq(Company::getCompanyName, company.getCompanyName()).count();
+ Long count = this.lambdaQuery().ne(Company::getId, dto.getId()).eq(Company::getCompanyName, company.getCompanyName()).count();
if (count > 0) {
throw new ServiceException("该公司账号已存在");
}
@@ -142,6 +157,7 @@
/**
* 删除企业
+ *
* @param id
*/
@Override
@@ -152,7 +168,7 @@
throw new ServiceException("删除失败，该企业不存在");
}
//删除企业账号
- userService.removeById(company.getUserId());
+ userService.removeById(company.getUserId());
//删除企业信息
this.removeById(id);
--
Gitblit v1.7.1