打包代码提交

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/UserApiFallbackFactory.java

@@ -152,6 +152,21 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
 
             }
 
+            @Override
+            public String enterpriseSearchByName(String keyword) {
+                return null;
+            }
+
+            @Override
+            public String enterpriseTicketInfoQueryById(String id) {
+                return null;
+            }
+
+            @Override
+            public String getUserIdByName(String name) {
+                return null;
+            }
+
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IUserApi.java

@@ -220,6 +220,30 @@ public interface IUserApi {
 
     @RequestMapping(value = BASE_URL + "/saveOrUpdate", method = RequestMethod.POST)
     void saveOrUpdate(@RequestBody UserDTO userDTO);
+
+    /**
+     * 根据关键字查询相关企业
+     * @param keyword
+     * @return
+     */
+    @GetMapping(value = BASE_URL + "/enterpriseSearchByName")
+    String enterpriseSearchByName(@RequestParam(value = "keyword")String keyword);
+
+    /**
+     * 根据id查询企业税号
+     * @param id
+     * @return
+     */
+    @GetMapping(value = BASE_URL + "/enterpriseTicketInfoQueryById")
+    String enterpriseTicketInfoQueryById(@RequestParam(value = "id")String id);
+
+    /**
+     * 根据用户name获取用户id
+     * @param name
+     * @return
+     */
+    @GetMapping(value = BASE_URL + "/getUserIdByName")
+    String getUserIdByName(@RequestParam(value = "name")String name);
 }
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/dto/DictTypeInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright &copy; 2021-2026 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.finance.invoice.service.dto;
+package com.jeeplus.sys.service.dto;
 
 import com.google.common.collect.Lists;
 import com.jeeplus.core.service.dto.BaseDTO;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/dto/DictValueInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright &copy; 2021-2026 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.finance.invoice.service.dto;
+package com.jeeplus.sys.service.dto;
 
 
 import com.jeeplus.core.service.dto.BaseDTO;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/controller/FinanceInvoiceController.java

@@ -4,10 +4,10 @@ import cn.hutool.log.Log;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.aop.demo.annotation.DemoMode;
+import com.jeeplus.assess.projectRecords.Utils.EasyPoiUtil;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
-import com.jeeplus.core.excel.EasyPoiUtil;
 import com.jeeplus.assess.invoice.service.FinanceInvoiceService;
 import com.jeeplus.assess.invoice.service.dto.FinanceDTO;
 import com.jeeplus.assess.invoice.service.dto.FinanceInvoiceDTO;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/controller/ProjectListController.java

@@ -6,6 +6,7 @@ import com.jeeplus.aop.demo.annotation.DemoMode;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.assess.program.configuration.projectList.service.ProjectListService;
 import com.jeeplus.assess.program.configuration.projectList.service.dto.*;
+import com.jeeplus.assess.projectRecords.Utils.EasyPoiUtil;
 import com.jeeplus.assess.workContract.domain.WorkContractInfo;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
@@ -14,7 +15,6 @@ import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.assess.utils.FreemarkerUtil;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
-import com.jeeplus.core.excel.EasyPoiUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/core/excel/EasyPoiUtil.java

@@ -1,11 +1,10 @@
-package com.jeeplus.core.excel;
+package com.jeeplus.assess.projectRecords.Utils;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
-import com.jeeplus.core.excel.ExcelDiceAddressListHandlerImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.web.multipart.MultipartFile;

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/core/excel/ExcelDiceAddressListHandlerImpl.java

@@ -1,9 +1,13 @@
-package com.jeeplus.core.excel;
+package com.jeeplus.assess.projectRecords.Utils;
 
 import cn.afterturn.easypoi.handler.inter.IExcelDictHandler;
 import cn.hutool.core.util.ObjectUtil;
-import com.jeeplus.sys.service.dto.DictValueDTO;
-import com.jeeplus.sys.utils.DictUtils;
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.jeeplus.sys.feign.IDictApi;
+import com.jeeplus.sys.service.dto.DictValueInfoDTO;
+//import com.jeeplus.sys.utils.DictUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,7 +42,9 @@ public class ExcelDiceAddressListHandlerImpl implements IExcelDictHandler {
 //        dictMap.put("dictKey", "1");
 //        dictMap.put("dictValue", "深度富有");
 //        list.add(dictMap);
-        List<DictValueDTO> dictValueDTOs = DictUtils.getDictMap ().get (dict);
+//        List<DictValueDTO> dictValueDTOs = DictUtils.getDictMap ().get (dict);
+        String datas = SpringUtil.getBean ( IDictApi.class ).getDictMap (dict);
+        List<DictValueInfoDTO> dictValueDTOs = JSON.parseObject(datas, new TypeReference<List<DictValueInfoDTO>>() {});
         dictValueDTOs.forEach (dictValueDTO -> {
             Map<String, String> dictMap = new HashMap<> ();
             dictMap.put ("dictKey", dictValueDTO.getValue ());
@@ -51,7 +57,7 @@ public class ExcelDiceAddressListHandlerImpl implements IExcelDictHandler {
     @Override
     public String toName(String dict, Object obj, String name, Object value) {
         if (ObjectUtil.isNotEmpty(value)) {
-            return DictUtils.getDictLabel (value.toString (), dict, null);
+            return SpringUtil.getBean ( IDictApi.class ).getDictLabel (value.toString (), dict, null);
         }
         return "";
     }
@@ -59,7 +65,7 @@ public class ExcelDiceAddressListHandlerImpl implements IExcelDictHandler {
     @Override
     public String toValue(String dict, Object obj, String name, Object value) {
         if (ObjectUtil.isNotEmpty(value)) {
-            return DictUtils.getDictLabel (value.toString (), dict, null);
+            return SpringUtil.getBean ( IDictApi.class ).getDictLabel (value.toString (), dict, null);
         }
         return "";
     }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/projectRecords/controller/ProjectController.java

@@ -11,25 +11,26 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.demo.annotation.DemoMode;
+import com.jeeplus.assess.projectRecords.Utils.EasyPoiUtil;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.ExportMode;
-import com.jeeplus.core.excel.EasyPoiUtil;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 //import com.jeeplus.pubmodules.oss.service.OssService;
 import com.jeeplus.assess.projectRecords.constant.enums.ProjectStatusEnum;
 import com.jeeplus.assess.projectRecords.constant.enums.ProjectTypeEnum;
 import com.jeeplus.assess.projectRecords.constant.enums.YesOrNoEnum;
 import com.jeeplus.assess.projectRecords.domain.Project;
 import com.jeeplus.assess.projectRecords.service.ProjectService;
-import com.jeeplus.sys.service.UserService;
+//import com.jeeplus.sys.service.UserService;
 import com.jeeplus.assess.projectRecords.service.dto.FileUploadListDTO;
 import com.jeeplus.assess.projectRecords.service.dto.ProjectDTO;
 import com.jeeplus.assess.projectRecords.service.mapstruct.ProjectWrapper;
@@ -77,8 +78,8 @@ public class ProjectController {
     @Autowired
     private ProjectService projectService;
 
-    @Autowired
-    private UserService userService;
+//    @Autowired
+//    private UserService userService;
 
 //    @Resource
 //    private OssService ossService;
@@ -91,7 +92,7 @@ public class ProjectController {
     public ResponseEntity<IPage<Project>> data(Project project, Page<Project> page) throws Exception {
         QueryWrapper<Project> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( project, Project.class );
         IPage<Project> result = projectService.selectPage (page,queryWrapper);
-        UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
+        UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         Boolean bmzrRoleFlag = false;
         if(null != currentUserDTO.getRoleDTOList() && currentUserDTO.getRoleDTOList().size()>0){
             for (RoleDTO roleDTO : currentUserDTO.getRoleDTOList()) {
@@ -142,7 +143,7 @@ public class ProjectController {
         Project pro = projectService.projectDtoToDate(project,projectDTO);
         pro.setItemType(projectDTO.getItemType());
         if(StringUtils.isNotBlank(projectDTO.getProjectHead())){
-            UserDTO projectHead = userService.get(projectDTO.getProjectHead());
+            UserDTO projectHead = SpringUtil.getBean ( IUserApi.class ).getById(projectDTO.getProjectHead());
             if(null == projectHead || StringUtils.isBlank(projectHead.getId())){
                 return ResponseEntity.badRequest().body("项目负责人不存在，请重新输入");
             }
@@ -372,7 +373,7 @@ public class ProjectController {
 
             //项目负责人、签字评估师1、签字评估师2 关联user表的id
             if(StringUtils.isNotBlank(project.getProjectHead())){
-                String id = userService.getUserIdByName(project.getProjectHead());
+                String id = SpringUtil.getBean ( IUserApi.class ).getUserIdByName(project.getProjectHead());
                 if(StringUtils.isNotBlank(id)){
                     project.setProjectHead(id);
                 }else{
@@ -412,7 +413,7 @@ public class ProjectController {
 
             //当前处理人
             if(StringUtils.isNotBlank(project.getCurrentDisposePerson())){
-                String id = userService.getUserIdByName(project.getCurrentDisposePerson());
+                String id = SpringUtil.getBean ( IUserApi.class ).getUserIdByName(project.getCurrentDisposePerson());
                 if(StringUtils.isNotBlank(id)){
                     project.setCurrentDisposePerson(id);
                 }else{

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/projectRecords/service/ProjectService.java

@@ -2,14 +2,18 @@ package com.jeeplus.assess.projectRecords.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.common.TokenProvider;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.assess.projectRecords.domain.Project;
 import com.jeeplus.assess.projectRecords.mapper.ProjectMapper;
 import com.jeeplus.assess.projectRecords.service.dto.FileUploadListDTO;
@@ -43,7 +47,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
     public Project selectByProjectId(String projectId){
         Project project = projectMapper.selectByProjectId(projectId);
 
-        UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
+        UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         Boolean bmzrRoleFlag = false;
         if(null != currentUserDTO.getRoleDTOList() && currentUserDTO.getRoleDTOList().size()>0){
             for (RoleDTO roleDTO : currentUserDTO.getRoleDTOList()) {
@@ -154,7 +158,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
 
     public List<FileUploadListDTO> exportFileUploadList(ProjectDTO projectDTO) {
         //queryWrapper.eq("su.del_flag", 0);
-        UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
+        UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         projectDTO.setOfficeDTO(currentUserDTO.getOfficeDTO());
         List<FileUploadListDTO> allList = projectMapper.projectAllList(projectDTO);
         //queryWrapper.eq("pr.file_upload_type", "1");

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/controller/ReimbursementInfoController.java

@@ -2,6 +2,7 @@ package com.jeeplus.assess.reimbursement.reimbursementInfo.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.assess.projectRecords.Utils.EasyPoiUtil;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
@@ -13,7 +14,6 @@ import com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.QueryListD
 import com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.RetureListDto;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.SaveInfoDto;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.TreeUserDto;
-import com.jeeplus.core.excel.EasyPoiUtil;
 import com.jeeplus.logging.annotation.ApiLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workClientInfo/controller/WorkClientController.java

@@ -2,16 +2,19 @@ package com.jeeplus.assess.workClientInfo.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.assess.workClientInfo.domain.WorkClientInfo;
 import com.jeeplus.assess.workClientInfo.domain.dto.WorkClientInfosDto;
 import com.jeeplus.assess.workClientInfo.service.WorkClientService;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.TicketQueryUtils;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.TicketQueryUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -49,7 +52,7 @@ public class WorkClientController {
             }
         }
         IPage<WorkClientInfo> list = workClientService.list(page,workClientInfoQueryWrapper);
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         for (WorkClientInfo info: list.getRecords()) {
             if(userDTO.getName().equals(info.getCreateById()) || userDTO.isAdmin()){
                 info.setCreateFlag("1");
@@ -164,7 +167,7 @@ public class WorkClientController {
         if(StringUtils.isBlank(keyword)){
             return null;
         }
-        return  TicketQueryUtils.enterpriseSearchByName(keyword);
+        return  SpringUtil.getBean ( IUserApi.class ).enterpriseSearchByName(keyword);
     }
 
     /**
@@ -178,7 +181,7 @@ public class WorkClientController {
         if(StringUtils.isBlank(id)){
             return null;
         }
-        return TicketQueryUtils.enterpriseTicketInfoQueryById(id);
+        return SpringUtil.getBean ( IUserApi.class ).enterpriseTicketInfoQueryById(id);
     }
 
     /**

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/controller/WorkContractController.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.core.query.QueryWrapperGenerator;
-import com.jeeplus.sys.utils.TicketQueryUtils;
+//import com.jeeplus.sys.utils.TicketQueryUtils;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.assess.workClientInfo.domain.WorkClientInfo;
 import com.jeeplus.assess.workClientInfo.domain.dto.WorkClientInfosDto;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/service/WorkContractFileService.java

@@ -1,5 +1,6 @@
 package com.jeeplus.assess.workContract.service;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,11 +8,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.assess.workContract.domain.WorkContractFile;
 import com.jeeplus.assess.workContract.mapper.WorkContractFileMapper;
 import com.jeeplus.assess.workContract.service.dto.WorkContractFileDto;
+import com.jeeplus.common.TokenProvider;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -45,7 +48,7 @@ public class WorkContractFileService {
     @Transactional(rollbackFor = Exception.class)
     public String add(WorkContractFileDto workContractFileDto) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         String id = UUID.randomUUID().toString().replace("-", "");
         WorkContractFile file = new WorkContractFile();
         BeanUtils.copyProperties(workContractFileDto, file);
@@ -64,7 +67,7 @@ public class WorkContractFileService {
     @Transactional(rollbackFor = Exception.class)
     public String update(WorkContractFileDto workContractFileDto, String id) {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         WorkContractFile file = new WorkContractFile();
         BeanUtils.copyProperties(workContractFileDto, file);
         file.setId(id);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/util/ExcelDiceAddressListHandlerImpl.java

@@ -5,9 +5,9 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
-import com.jeeplus.finance.invoice.service.dto.DictValueInfoDTO;
 import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.service.dto.DictValueInfoDTO;
 //import com.jeeplus.sys.utils.DictUtils;
 //import com.jeeplus.sys.service.dto.DictValueDTO;
 //import com.jeeplus.sys.utils.DictUtils;

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/UserApiImpl.java

@@ -12,10 +12,7 @@ import com.jeeplus.sys.service.dto.CertDTO;
 import com.jeeplus.sys.service.dto.DataRuleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.service.mapstruct.UserWrapper;
-import com.jeeplus.sys.utils.FileKit;
-import com.jeeplus.sys.utils.FileUtils;
-import com.jeeplus.sys.utils.TenantUtils;
-import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.sys.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -179,4 +176,19 @@ public class UserApiImpl implements IUserApi {
         userService.saveOrUpdate(userDTO);
     }
 
+    @Override
+    public String enterpriseSearchByName(String keyword) {
+        return TicketQueryUtils.enterpriseSearchByName(keyword);
+    }
+
+    @Override
+    public String enterpriseTicketInfoQueryById(String id) {
+        return TicketQueryUtils.enterpriseTicketInfoQueryById(id);
+    }
+
+    @Override
+    public String getUserIdByName(String name) {
+        return userService.getUserIdByName(name) ;
+    }
+
 }