From 687134c3e65e3672379f4ab0bd29a4f88cf5f9f4 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 一月 2025 18:21:22 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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..471b014 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
@@ -103,6 +103,7 @@
//添加用户信息
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);
@@ -190,16 +191,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