From a1f7d8df7827e1c09fafaeb839163e9348d5ee2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Mon, 30 Dec 2024 23:41:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/wechat/WxController.java | 2 +- ...roProjectInfoSubdeptsUsersServiceImpl.java | 3 +- .../service/impl/SysDictDataServiceImpl.java | 2 +- .../service/impl/SysDictTypeServiceImpl.java | 28 +++++++++---------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java index 3c7bb59c..0732eb24 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java @@ -2,12 +2,12 @@ package com.yanzhu.manage.controller.wechat; import com.yanzhu.common.core.web.controller.BaseController; import com.yanzhu.common.core.web.domain.AjaxResult; -import com.yanzhu.common.security.utils.DictUtils; import com.yanzhu.manage.domain.BusExamUser; import com.yanzhu.manage.domain.ProProjectInfoSubdepts; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers; import com.yanzhu.manage.domain.SignetFileVo; import com.yanzhu.manage.service.*; +import com.yanzhu.security.utils.DictUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index 333c12b5..06d73456 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -7,7 +7,6 @@ import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.text.Convert; import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.StringUtils; -import com.yanzhu.common.security.utils.DictUtils; import com.yanzhu.common.security.utils.SecurityUtils; import com.yanzhu.manage.config.ProfileConfig; import com.yanzhu.manage.domain.*; @@ -23,10 +22,10 @@ import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService; import com.yanzhu.manage.service.IUniService; import com.yanzhu.manage.utils.WxQrCodeUtils; import com.yanzhu.manage.utils.pdf.PoiUtil; +import com.yanzhu.security.utils.DictUtils; import com.yanzhu.system.api.RemoteFlowService; import com.yanzhu.system.api.RemoteUserService; import com.yanzhu.system.api.domain.SysUser; -import me.chanjar.weixin.mp.api.WxMpService; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java index c0387af4..f2737e61 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java @@ -2,7 +2,7 @@ package com.yanzhu.system.service.impl; import java.util.List; -import com.yanzhu.common.security.utils.DictUtils; +import com.yanzhu.security.utils.DictUtils; import com.yanzhu.system.mapper.SysDictDataMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java index 72910b7c..0f1b8d54 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java @@ -1,23 +1,23 @@ package com.yanzhu.system.service.impl; +import com.yanzhu.common.core.constant.UserConstants; +import com.yanzhu.common.core.exception.ServiceException; +import com.yanzhu.common.core.utils.StringUtils; +import com.yanzhu.security.utils.DictUtils; +import com.yanzhu.system.api.domain.SysDictData; +import com.yanzhu.system.api.domain.SysDictType; +import com.yanzhu.system.mapper.SysDictDataMapper; +import com.yanzhu.system.mapper.SysDictTypeMapper; +import com.yanzhu.system.service.ISysDictTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.PostConstruct; import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; - -import com.yanzhu.common.security.utils.DictUtils; -import com.yanzhu.system.mapper.SysDictDataMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.yanzhu.common.core.constant.UserConstants; -import com.yanzhu.common.core.exception.ServiceException; -import com.yanzhu.common.core.utils.StringUtils; -import com.yanzhu.system.api.domain.SysDictData; -import com.yanzhu.system.api.domain.SysDictType; -import com.yanzhu.system.mapper.SysDictTypeMapper; -import com.yanzhu.system.service.ISysDictTypeService; /** * 字典 业务层处理