From e5bdccc3acf92c9a72ec4352845130068ae1bbe4 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 22 一月 2025 10:51:13 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 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 d2764db..96b72b8 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
@@ -13,7 +13,8 @@
import com.ruoyi.company.api.domain.dto.MgtCompanyDTO;
import com.ruoyi.company.api.domain.excel.MgtCompanyExcel;
import com.ruoyi.company.api.domain.query.MgtCompanyQuery;
-import com.ruoyi.company.api.domain.vo.MgtCompanyVO;
+import com.ruoyi.company.domain.vo.MgtCompanyDetailVO;
+import com.ruoyi.company.domain.vo.MgtCompanyVO;
import com.ruoyi.company.mapper.CompanyMapper;
import com.ruoyi.company.service.CompanyService;
import com.ruoyi.company.service.UserService;
@@ -72,11 +73,11 @@
* @return
*/
@Override
- public MgtCompanyVO queryCompanyDetail(Long id) {
+ public MgtCompanyDetailVO queryCompanyDetail(Long id) {
Company company = this.getById(id);
- MgtCompanyVO mgtCompanyVO = BeanUtils.copyBean(company, MgtCompanyVO.class);
+ MgtCompanyDetailVO mgtCompanyVO = BeanUtils.copyBean(company, MgtCompanyDetailVO.class);
if (Objects.isNull(mgtCompanyVO)) {
- mgtCompanyVO = new MgtCompanyVO();
+ mgtCompanyVO = new MgtCompanyDetailVO();
return mgtCompanyVO;
}
User user = userService.getById(company.getUserId());
@@ -103,14 +104,15 @@
//添加用户信息
User user = BeanUtils.copyBean(dto, User.class);
user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ user.setCreateBy(SecurityUtils.getUserId());
userService.save(user);
Company company = BeanUtils.copyBean(dto, Company.class);
company.setUserId(user.getUserId());
//根据公司名称查询数据库
- Long count = this.lambdaQuery().eq(Company::getCompanyName, company.getCompanyName()).count();
+ Long count = this.lambdaQuery().eq(Company::getCompanyName, company.getCompanyName()).eq(Company::getSocialCode, dto.getSocialCode()).count();
if (count > 0) {
- throw new ServiceException("该公司账号已存在");
+ throw new ServiceException("该企业已存在");
}
//身份证二要素校验
Boolean res = aliyunCloudAuthUtil.verifyIdCard(dto.getLegalPersonName(), dto.getIdCardNumber());
@@ -153,9 +155,15 @@
userUpd.setUpdateBy(SecurityUtils.getUserId());
userService.updateById(userUpd);
//根据公司名称查询数据库
- Long count = this.lambdaQuery().ne(Company::getId, dto.getId()).eq(Company::getCompanyName, company.getCompanyName()).count();
- if (count > 0) {
- throw new ServiceException("该公司账号已存在");
+ if (StringUtils.isNotBlank(company.getCompanyName())){
+ Long count = this.lambdaQuery()
+ .ne(Company::getId, dto.getId())
+ .eq(Company::getSocialCode, company.getSocialCode())
+ .eq(Company::getCompanyName, dto.getCompanyName())
+ .count();
+ if (count > 0) {
+ throw new ServiceException("该企业已存在");
+ }
}
//身份证二要素校验
Boolean res = aliyunCloudAuthUtil.verifyIdCard(dto.getLegalPersonName(), dto.getIdCardNumber());
@@ -190,16 +198,24 @@
@Override
public void export(MgtCompanyQuery query) throws IOException {
List<Company> list = 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()).list();
+ .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).list();
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
- response.setCharacterEncoding
-
- ("utf-8");
+ response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("企业信息导出数据", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
--
Gitblit v1.7.1