From 297ce85ce1a7e086cd146c992a1bda903f2cc978 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 22 Apr 2024 13:45:14 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DownloadController.java | 4 ++- .../service/impl/SystemUserServiceImpl.java | 6 ++++ .../modules/car/mapper/xml/CarInfoMapper.xml | 3 -- .../impl/EnterpriseInfoServiceImpl.java | 35 +++++++++++++++++-- .../service/impl/WorkerInfoServiceImpl.java | 7 +++- ...SupplierQualificationApplyServiceImpl.java | 3 +- 6 files changed, 49 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java index 87a72167c..6a3e4a19c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java @@ -144,11 +144,12 @@ public class DownloadController { @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "inserviceType", value = "在职状态 1在职 2离职", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "userId", value = "用户id", paramType = "query", required = false, dataType = "String"), }) @GetMapping(value = "/exportExcelWorkerInfo") public void exportExcelWorkerInfo(HttpServletResponse response, Integer personType, String projectSn, String userEnterpriseId, String teamId, Integer inserviceType, String departmentId, String enterDate, Integer codeState, - String enterpriseId, String idCard, String workerName, Integer selectType) { + String enterpriseId, String idCard, String workerName, Integer selectType, Long userId) { Map map = new HashMap<>(); map.put("personType", personType); map.put("teamId", teamId); @@ -162,6 +163,7 @@ public class DownloadController { map.put("workerName", workerName); map.put("codeState", codeState); map.put("selectType", selectType); + map.put("userId", userId); workerInfoService.exportExcelWorkerInfo(response, map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 269c17674..c20145170 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -1518,12 +1518,18 @@ public class SystemUserServiceImpl extends ServiceImpl and a.car_number like CONCAT(CONCAT('%',#{param.carNumber}),'%') - - and a.enterprise_id = #{param.enterpriseId} - and a.is_black=#{param.isBlack} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java index f66824420..a6c8110c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.worker.service.impl; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -104,8 +105,21 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl getSupplierEnterprises(Map map) { List list = enterpriseInfoMapper.getEnterpriseInfoList(map); UserInfo user = SecurityUtils.getUser(); - EnterpriseInfo info = xzSupplierQualificationApplyService.getSupplierInfoByUserId(user.getUserId()); - Optional optional = list.stream().filter(entityMap -> entityMap.get("id").equals(info.getId().toString())).findFirst(); + Long userId; + if (user == null) { + userId = MapUtils.getLong(map, "userId"); + } else { + userId = user.getUserId(); + } + EnterpriseInfo info = null; + try { + info = xzSupplierQualificationApplyService.getSupplierInfoByUserId(userId); + } catch (Exception e) { + log.error("", e); + return new ArrayList<>(); + } + EnterpriseInfo finalInfo = info; + Optional optional = list.stream().filter(entityMap -> entityMap.get("id").equals(finalInfo.getId().toString())).findFirst(); if (!optional.isPresent()) { return new ArrayList<>(); } @@ -114,7 +128,22 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl rtList = new ArrayList<>(); rtList.add(infoMap); rtList.addAll(childrenAsList); - return rtList; + //搜索填了企业 + String enterpriseId = MapUtils.getString(map, "enterpriseId"); + if (StrUtil.isNotBlank(enterpriseId)) { + Optional have = rtList.stream().filter(entityMap -> entityMap.get("id").equals(enterpriseId)).findFirst(); + if (!have.isPresent()) { + return new ArrayList<>(); + } + EntityMap searchCompany = have.get(); + rtList = new ArrayList<>(); + rtList.add(searchCompany); + List childrenAsList1 = ListUtils.getChildrenAsList(searchCompany, list, "id", "parentEnterpriseId"); + rtList.addAll(childrenAsList1); + return rtList; + } else { + return rtList; + } } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index e92fbb499..729059389 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -868,8 +868,13 @@ public class WorkerInfoServiceImpl extends ServiceImpl map) { try { + String userId = MapUtils.getString(map, "userId"); List list = new ArrayList<>(); - if (systemUserService.isSupplier()) { + SystemUser su = null; + if (StringUtils.isNotBlank(userId)) { + su = systemUserMapper.selectById(userId); + } + if (su != null && su.getAccountType() == 11) { List enterprises = enterpriseInfoService.getSupplierEnterprises(map); if (CollUtil.isNotEmpty(enterprises)) { map.put("enterpriseIds", enterprises.stream().map(entityMap -> entityMap.get("id")).collect(Collectors.toList())); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java index ea2e3a417..c0754bac2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java @@ -35,6 +35,7 @@ import org.apache.commons.collections.MapUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -169,7 +170,7 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl eiMap = new HashMap<>(); eiMap.put("userId", applyUserId);