工具类重命名

hx-common/src/main/java/com/fjhx/common/service/contract/impl/ContractTemplateServiceImpl.java

@@ -9,7 +9,7 @@ import com.fjhx.common.entity.contract.po.ContractTemplate;
 import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
 import com.fjhx.common.mapper.contract.ContractTemplateMapper;
 import com.fjhx.common.service.contract.ContractTemplateService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -55,7 +55,7 @@ public class ContractTemplateServiceImpl extends ServiceImpl<ContractTemplateMap
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(ContractTemplateVo::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         for (ContractTemplateVo record : records) {
             //赋值生产公司名称

hx-common/src/main/java/com/fjhx/common/service/corporation/impl/CorporationServiceImpl.java

@@ -13,7 +13,7 @@ import com.fjhx.common.entity.corporation.vo.CorporationVo;
 import com.fjhx.common.mapper.corporation.CorporationMapper;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.file.utils.ObsFileUtil;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.stereotype.Service;
@@ -62,7 +62,7 @@ public class CorporationServiceImpl extends ServiceImpl<CorporationMapper, Corpo
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(Corporation::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         for (CorporationVo record : records) {
             //赋值生产公司名称

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerServiceImpl.java

@@ -31,7 +31,7 @@ import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.fjhx.tenant.utils.DictCodingService;
 import com.fjhx.tenant.utils.DictUtils;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -613,7 +613,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         CustomizeAreaUtil.setAreaName(list);
         UserUtil.assignmentNickName(list, CustomerVo::getUserId, CustomerVo::setUserName);
 
-        DeptUstil.assignmentNickName(list, Customer::getDeptId, CustomerVo::setDeptName);
+        DeptUtils.assignmentNickName(list, Customer::getDeptId, CustomerVo::setDeptName);
 
         Map<String, Map<String, String>> allDictMap = DictUtils.getAllDictKVMap();
         for (CustomerVo customerVo : list) {

hx-iot/src/main/java/com/fjhx/iot/service/tda/impl/TdaDeviceServiceImpl.java

@@ -14,7 +14,7 @@ import com.fjhx.iot.mapper.tda.TdaDeviceMapper;
 import com.fjhx.iot.service.tda.TdaDeviceService;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
@@ -66,7 +66,7 @@ public class TdaDeviceServiceImpl extends ServiceImpl<TdaDeviceMapper, TdaDevice
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(TdaDevice::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         for (TdaDeviceVo record : records) {
             //赋值生产公司名称

hx-mes/src/main/java/com/fjhx/mes/service/material/impl/MaterialPreparationServiceImpl.java

@@ -9,7 +9,7 @@ import com.fjhx.mes.entity.material.po.MaterialPreparation;
 import com.fjhx.mes.entity.material.vo.MaterialPreparationVo;
 import com.fjhx.mes.mapper.material.MaterialPreparationMapper;
 import com.fjhx.mes.service.material.MaterialPreparationService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -70,7 +70,7 @@ public class MaterialPreparationServiceImpl extends ServiceImpl<MaterialPreparat
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(MaterialPreparation::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         for (MaterialPreparationVo record : records) {
             //赋值生产公司名称

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -44,7 +44,7 @@ import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.socket.core.PushTypeEnum;
 import com.fjhx.socket.core.WebSocketPush;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.entity.stock.po.StockWait;
@@ -252,7 +252,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         //获取生产部门信息
         List<Long> companyIds = schedulingList.stream().map(ProductionOrderVo::getCompanyId).collect(Collectors.toList());
         if (ObjectUtil.isNotEmpty(companyIds)) {
-            Map<Long, String> deptMap = DeptUstil.getDeptNameMap(companyIds);
+            Map<Long, String> deptMap = DeptUtils.getDeptNameMap(companyIds);
             for (ProductionOrderVo productionOrderVo : schedulingList) {
                 //赋值生产公司名称
                 productionOrderVo.setCompanyName(deptMap.get(productionOrderVo.getCompanyId()));

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionReportingDetailServiceImpl.java

@@ -12,7 +12,7 @@ import com.fjhx.mes.entity.production.po.ProductionReportingDetail;
 import com.fjhx.mes.entity.production.vo.ProductionReportingDetailVo;
 import com.fjhx.mes.mapper.production.ProductionReportingDetailMapper;
 import com.fjhx.mes.service.production.ProductionReportingDetailService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -88,7 +88,7 @@ public class ProductionReportingDetailServiceImpl extends ServiceImpl<Production
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(ProductionReportingDetail::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         for (ProductionReportingDetailVo record : records) {
             //赋值生产公司名称

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionReportingServiceImpl.java

@@ -17,7 +17,7 @@ import com.fjhx.mes.entity.technology.po.TechnologyProcessLine;
 import com.fjhx.mes.mapper.production.ProductionReportingMapper;
 import com.fjhx.mes.service.production.*;
 import com.fjhx.mes.service.technology.TechnologyProcessLineService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -97,7 +97,7 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(ProductionReporting::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         for (ProductionReportingVo record : records) {
             //赋值生产公司名称

hx-mes/src/main/java/com/fjhx/mes/service/report/impl/ReportLossesDetailsServiceImpl.java

@@ -24,7 +24,7 @@ import com.fjhx.mes.service.production.ProduceOrderService;
 import com.fjhx.mes.service.production.ProductionProcessesService;
 import com.fjhx.mes.service.report.ReportLossesDetailsService;
 import com.fjhx.mes.service.technology.TechnologyProcessLineService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
@@ -125,7 +125,7 @@ public class ReportLossesDetailsServiceImpl extends ServiceImpl<ReportLossesDeta
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(ReportLossesDetailsVo::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         //获取工序信息
         List<Long> ppIds = records.stream().map(ReportLossesDetails::getProcessId).collect(Collectors.toList());

hx-oa/src/main/java/com/fjhx/oa/service/activity/impl/ActivityPriceInventoryServiceImpl.java

@@ -22,7 +22,7 @@ import com.fjhx.oa.entity.education.po.EducationSubsidy;
 import com.fjhx.oa.mapper.activity.ActivityPriceInventoryMapper;
 import com.fjhx.oa.service.activity.ActivityPriceInventoryDetailService;
 import com.fjhx.oa.service.activity.ActivityPriceInventoryService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -92,14 +92,14 @@ public class ActivityPriceInventoryServiceImpl extends ServiceImpl<ActivityPrice
         }
         //中心、部门、申请人
         UserUtil.assignmentNickName(records, ActivityPriceInventoryVo::getCreateUser, ActivityPriceInventoryVo::setCreateUserName);
-        DeptUstil.assignmentNickName(records, ActivityPriceInventoryVo::getDeptId, ActivityPriceInventoryVo::setDeptName);
-        DeptUstil.assignmentNickName(records, ActivityPriceInventoryVo::getCompanyId, ActivityPriceInventoryVo::setCompanyName);
+        DeptUtils.assignmentNickName(records, ActivityPriceInventoryVo::getDeptId, ActivityPriceInventoryVo::setDeptName);
+        DeptUtils.assignmentNickName(records, ActivityPriceInventoryVo::getCompanyId, ActivityPriceInventoryVo::setCompanyName);
         //店铺名称
         shopInfoService.attributeAssign(records, ActivityPriceInventory::getShopId, (item, shop) -> {
             item.setShopName(shop.getName());
         });
         //支持方
-        DeptUstil.assignmentNickName(records, ActivityPriceInventoryVo::getSupporterId, ActivityPriceInventoryVo::setSupporterName);
+        DeptUtils.assignmentNickName(records, ActivityPriceInventoryVo::getSupporterId, ActivityPriceInventoryVo::setSupporterName);
     }
 
     @DSTransactional

hx-oa/src/main/java/com/fjhx/oa/service/education/impl/EducationSubsidyServiceImpl.java

@@ -18,7 +18,7 @@ import com.fjhx.oa.entity.education.vo.EducationSubsidyVo;
 import com.fjhx.oa.mapper.education.EducationSubsidyMapper;
 import com.fjhx.oa.service.education.EducationConfigService;
 import com.fjhx.oa.service.education.EducationSubsidyService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -83,8 +83,8 @@ public class EducationSubsidyServiceImpl extends ServiceImpl<EducationSubsidyMap
         });
 
         UserUtil.assignmentNickName(records, EducationSubsidyVo::getCreateUser, EducationSubsidyVo::setCreateUserName);
-        DeptUstil.assignmentNickName(records, EducationSubsidyVo::getDeptId, EducationSubsidyVo::setDeptName);
-        DeptUstil.assignmentNickName(records, EducationSubsidyVo::getCompanyId, EducationSubsidyVo::setCompanyName);
+        DeptUtils.assignmentNickName(records, EducationSubsidyVo::getDeptId, EducationSubsidyVo::setDeptName);
+        DeptUtils.assignmentNickName(records, EducationSubsidyVo::getCompanyId, EducationSubsidyVo::setCompanyName);
     }
 
     @DSTransactional

hx-oa/src/main/java/com/fjhx/oa/service/epiboly/impl/EpibolyBillServiceImpl.java

@@ -17,7 +17,7 @@ import com.fjhx.oa.entity.epiboly.po.EpibolyBill;
 import com.fjhx.oa.entity.epiboly.vo.EpibolyBillVo;
 import com.fjhx.oa.mapper.epiboly.EpibolyBillMapper;
 import com.fjhx.oa.service.epiboly.EpibolyBillService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.utils.UserUtil;
@@ -77,8 +77,8 @@ public class EpibolyBillServiceImpl extends ServiceImpl<EpibolyBillMapper, Epibo
             return;
         }
         UserUtil.assignmentNickName(records, EpibolyBill::getCreateUser, EpibolyBillVo::setCreateUserName);
-        DeptUstil.assignmentNickName(records, EpibolyBill::getDeptId, EpibolyBillVo::setDeptName);
-        DeptUstil.assignmentNickName(records, EpibolyBill::getCompanyId, EpibolyBillVo::setCompanyName);
+        DeptUtils.assignmentNickName(records, EpibolyBill::getDeptId, EpibolyBillVo::setDeptName);
+        DeptUtils.assignmentNickName(records, EpibolyBill::getCompanyId, EpibolyBillVo::setCompanyName);
         //赋值承包商
         contractorService.attributeAssign(records, EpibolyBillVo::getContractorId, (item, contractor) -> {
             item.setContractorName(contractor.getName());

hx-oa/src/main/java/com/fjhx/oa/service/erp/impl/ErpCodingGroupServiceImpl.java

@@ -17,7 +17,7 @@ import com.fjhx.oa.entity.erp.po.ErpCodingGroup;
 import com.fjhx.oa.entity.erp.vo.ErpCodingGroupVo;
 import com.fjhx.oa.mapper.erp.ErpCodingGroupMapper;
 import com.fjhx.oa.service.erp.ErpCodingGroupService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -81,8 +81,8 @@ public class ErpCodingGroupServiceImpl extends ServiceImpl<ErpCodingGroupMapper,
         }
 
         UserUtil.assignmentNickName(records, ErpCodingGroup::getCreateUser, ErpCodingGroupVo::setCreateUserName);
-        DeptUstil.assignmentNickName(records, ErpCodingGroup::getDeptId, ErpCodingGroupVo::setDeptName);
-        DeptUstil.assignmentNickName(records, ErpCodingGroup::getCompanyId, ErpCodingGroupVo::setCompanyName);
+        DeptUtils.assignmentNickName(records, ErpCodingGroup::getDeptId, ErpCodingGroupVo::setDeptName);
+        DeptUtils.assignmentNickName(records, ErpCodingGroup::getCompanyId, ErpCodingGroupVo::setCompanyName);
     }
 
     @DSTransactional

hx-oa/src/main/java/com/fjhx/oa/service/invoice/impl/InvoiceApplyServiceImpl.java

@@ -22,7 +22,7 @@ import com.fjhx.oa.mapper.invoice.InvoiceApplyMapper;
 import com.fjhx.oa.service.invoice.InvoiceApplyContractDetailService;
 import com.fjhx.oa.service.invoice.InvoiceApplyDetailService;
 import com.fjhx.oa.service.invoice.InvoiceApplyService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -93,8 +93,8 @@ public class InvoiceApplyServiceImpl extends ServiceImpl<InvoiceApplyMapper, Inv
             return;
         }
         UserUtil.assignmentNickName(records, InvoiceApply::getCreateUser, InvoiceApplyVo::setCreateUserName);
-        DeptUstil.assignmentNickName(records, InvoiceApply::getDeptId, InvoiceApplyVo::setDeptName);
-        DeptUstil.assignmentNickName(records, InvoiceApply::getCompanyId, InvoiceApplyVo::setCompanyName);
+        DeptUtils.assignmentNickName(records, InvoiceApply::getDeptId, InvoiceApplyVo::setDeptName);
+        DeptUtils.assignmentNickName(records, InvoiceApply::getCompanyId, InvoiceApplyVo::setCompanyName);
     }
 
     @DSTransactional

hx-oa/src/main/java/com/fjhx/oa/service/medical/impl/MedicalInsuranceServiceImpl.java

@@ -16,7 +16,7 @@ import com.fjhx.oa.entity.medical.po.MedicalInsurance;
 import com.fjhx.oa.entity.medical.vo.MedicalInsuranceVo;
 import com.fjhx.oa.mapper.medical.MedicalInsuranceMapper;
 import com.fjhx.oa.service.medical.MedicalInsuranceService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -75,8 +75,8 @@ public class MedicalInsuranceServiceImpl extends ServiceImpl<MedicalInsuranceMap
             return;
         }
         UserUtil.assignmentNickName(records, MedicalInsuranceVo::getCreateUser, MedicalInsuranceVo::setCreateUserName);
-        DeptUstil.assignmentNickName(records, MedicalInsuranceVo::getDeptId, MedicalInsuranceVo::setDeptName);
-        DeptUstil.assignmentNickName(records, MedicalInsuranceVo::getCompanyId, MedicalInsuranceVo::setCompanyName);
+        DeptUtils.assignmentNickName(records, MedicalInsuranceVo::getDeptId, MedicalInsuranceVo::setDeptName);
+        DeptUtils.assignmentNickName(records, MedicalInsuranceVo::getCompanyId, MedicalInsuranceVo::setCompanyName);
     }
 
     @DSTransactional

hx-oa/src/main/java/com/fjhx/oa/service/seal/impl/SealConfigServiceImpl.java

@@ -10,7 +10,7 @@ import com.fjhx.oa.entity.seal.po.SealConfig;
 import com.fjhx.oa.entity.seal.vo.SealConfigVo;
 import com.fjhx.oa.mapper.seal.SealConfigMapper;
 import com.fjhx.oa.service.seal.SealConfigService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.utils.UserUtil;
@@ -61,7 +61,7 @@ public class SealConfigServiceImpl extends ServiceImpl<SealConfigMapper, SealCon
         }
 
         UserUtil.assignmentNickName(records, SealConfigVo::getCustodyUserId, SealConfigVo::setCustodyUserName);
-        DeptUstil.assignmentNickName(records, SealConfigVo::getCustodyDeptId, SealConfigVo::setCustodyDeptName);
+        DeptUtils.assignmentNickName(records, SealConfigVo::getCustodyDeptId, SealConfigVo::setCustodyDeptName);
     }
 
     @Override

hx-oa/src/main/java/com/fjhx/oa/service/user/impl/UserSalaryManageServiceImpl.java

@@ -20,7 +20,7 @@ import com.fjhx.oa.mapper.user.UserSalaryManageMapper;
 import com.fjhx.oa.service.user.UserSalaryDetailService;
 import com.fjhx.oa.service.user.UserSalaryManageService;
 import com.fjhx.oa.service.user.UserSalaryService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
@@ -184,7 +184,7 @@ public class UserSalaryManageServiceImpl extends ServiceImpl<UserSalaryManageMap
         );
 
         Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(userIds, 10);
-        Map<Long, String> deptNameMap = DeptUstil.getDeptNameMap();
+        Map<Long, String> deptNameMap = DeptUtils.getDeptNameMap();
         for (UserSalaryManageVo userSalaryManageVo : list) {
             userSalaryManageVo.setUserSalaryDetailList(usdMap.getOrDefault(userSalaryManageVo.getUserId(), new ArrayList<>()));
             userSalaryManageVo.setFileList(fileMap.getOrDefault(userSalaryManageVo.getUserId(), new ArrayList<>()));
@@ -193,7 +193,7 @@ public class UserSalaryManageServiceImpl extends ServiceImpl<UserSalaryManageMap
         }
 
         //赋值部门名称树
-        DeptUstil.assignmentDeptNames(list, UserSalaryManageVo::getDeptId, (item, nameList) -> {
+        DeptUtils.assignmentDeptNames(list, UserSalaryManageVo::getDeptId, (item, nameList) -> {
             item.setDeptNames(nameList.stream().collect(Collectors.joining("=>")));
         });
 

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -30,7 +30,7 @@ import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -174,7 +174,7 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(SubscribeDetail::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         // 赋值产品信息
         productInfoService.attributeAssign(records, SubscribeDetailVo::getProductId, (item, productInfo) -> {

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

@@ -20,7 +20,7 @@ import com.fjhx.sale.entity.contract.vo.ContractProductVo;
 import com.fjhx.sale.mapper.contract.ContractProductMapper;
 import com.fjhx.sale.service.contract.ContractProductBomService;
 import com.fjhx.sale.service.contract.ContractProductService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -120,7 +120,7 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(ContractProductVo::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
         for (ContractProductVo record : records) {
             //赋值生产公司名称
             record.setCorporationName(companyNameMap.get(record.getCompanyId()));

hx-sale/src/main/java/com/fjhx/sale/service/ext/impl/ExtQuotationServiceImpl.java

@@ -37,7 +37,7 @@ import com.fjhx.sale.service.quotation.QuotationProductService;
 import com.fjhx.sale.service.sale.SaleQuotationService;
 import com.fjhx.socket.core.PushTypeEnum;
 import com.fjhx.socket.core.WebSocketPush;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -566,7 +566,7 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
         Assert.notEmpty(result, "查询不到明细信息请检查");
 
         //获取归属公司信息
-        result.setCompanyName(DeptUstil.getDeptNameMap().get(result.getCompanyId()));
+        result.setCompanyName(DeptUtils.getDeptNameMap().get(result.getCompanyId()));
 
         //获取报价单产品id
         List<ExtQuotationProductVo> extProductList = extQuotationProductService.getList(IWrapper.getWrapper().eq("eqp", ExtQuotationProduct::getSaleQuotationId, id));

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -74,7 +74,7 @@ import com.fjhx.supply.entity.supplier.po.SupplierPrice;
 import com.fjhx.supply.entity.supplier.vo.SupplierPriceVo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.fjhx.supply.service.supplier.SupplierPriceService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.service.stock.StockWaitService;
@@ -241,7 +241,7 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(EhsdPurchase::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         for (EhsdPurchaseVo record : records) {
             //赋值生产公司名称

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -56,7 +56,7 @@ import com.fjhx.socket.core.PushTypeEnum;
 import com.fjhx.socket.core.WebSocketPush;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.fjhx.tenant.utils.DictUtils;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -383,7 +383,7 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         }
 
         //获取归属公司信息
-        Map<Long, String> deptNameMap = DeptUstil.getDeptNameMap();
+        Map<Long, String> deptNameMap = DeptUtils.getDeptNameMap();
         result.setCompanyName(deptNameMap.get(result.getCompanyId()));
         result.setOfCompanyName(deptNameMap.get(result.getOfCompanyId()));
         result.setOfDeptName(deptNameMap.get(result.getOfDeptId()));

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -26,7 +26,7 @@ import com.fjhx.supply.utils.CodeEnum;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.fjhx.tenant.utils.DictUtils;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
@@ -105,14 +105,14 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
 
         //获取归属公司信息
         List<Long> companyIds = records.stream().map(SupplierInfo::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         for (SupplierInfoVo record : records) {
             //赋值生产公司名称
             record.setCompanyName(companyNameMap.get(record.getCompanyId()));
         }
         UserUtil.assignmentNickName(records, SupplierInfoVo::getDevUserId, SupplierInfoVo::setDevUserName);
-        DeptUstil.assignmentNickName(records, SupplierInfo::getDeptId, SupplierInfoVo::setDeptName);
+        DeptUtils.assignmentNickName(records, SupplierInfo::getDeptId, SupplierInfoVo::setDeptName);
     }
 
     @Override

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierPriceServiceImpl.java

@@ -16,7 +16,7 @@ import com.fjhx.supply.entity.supplier.vo.SupplierPriceAddVo;
 import com.fjhx.supply.entity.supplier.vo.SupplierPriceVo;
 import com.fjhx.supply.mapper.supplier.SupplierPriceMapper;
 import com.fjhx.supply.service.supplier.SupplierPriceService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -109,7 +109,7 @@ public class SupplierPriceServiceImpl extends ServiceImpl<SupplierPriceMapper, S
 
         //获取归属公司信息
         List<Long> companyIds = records.stream().map(SupplierPrice::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUtils.getDeptNameMap(companyIds);
 
         for (SupplierPriceVo record : records) {
             //赋值生产公司名称

hx-wms/src/main/java/com/fjhx/wms/service/manual/impl/ManualStockDetailsServiceImpl.java

@@ -3,7 +3,7 @@ package com.fjhx.wms.service.manual.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.fjhx.wms.entity.manual.dto.ManualStockDetailsSelectDto;
 import com.fjhx.wms.entity.manual.po.ManualStockDetails;
 import com.fjhx.wms.entity.manual.vo.ManualStockDetailsVo;
@@ -67,7 +67,7 @@ public class ManualStockDetailsServiceImpl extends ServiceImpl<ManualStockDetail
             return;
         }
         UserUtil.assignmentNickName(list, ManualStockDetailsVo::getCreateUser, ManualStockDetailsVo::setOpUserName);
-        DeptUstil.assignmentNickName(list, ManualStockDetailsVo::getCompanyId, ManualStockDetailsVo::setCompanyName);
+        DeptUtils.assignmentNickName(list, ManualStockDetailsVo::getCompanyId, ManualStockDetailsVo::setCompanyName);
         warehouseService.attributeAssign(list, ManualStockDetailsVo::getWarehouseId, (item, warehouse) -> {
             item.setWarehouseName(warehouse.getName());
         });

hx-wms/src/main/java/com/fjhx/wms/service/manual/impl/ManualStockServiceImpl.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.flow.service.flow.FlowExampleService;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.tenant.utils.DeptUtils;
 import com.fjhx.wms.entity.manual.dto.ManualStockDto;
 import com.fjhx.wms.entity.manual.dto.ManualStockSelectDto;
 import com.fjhx.wms.entity.manual.po.ManualStock;
@@ -82,7 +82,7 @@ public class ManualStockServiceImpl extends ServiceImpl<ManualStockMapper, Manua
             return;
         }
         UserUtil.assignmentNickName(list, ManualStockVo::getCreateUser, ManualStockVo::setOpUserName);
-        DeptUstil.assignmentNickName(list, ManualStockVo::getCompanyId, ManualStockVo::setCompanyName);
+        DeptUtils.assignmentNickName(list, ManualStockVo::getCompanyId, ManualStockVo::setCompanyName);
         warehouseService.attributeAssign(list, ManualStockVo::getWarehouseId, (item, warehouse) -> {
             item.setWarehouseName(warehouse.getName());
         });