From 0272bb9a6352a11c9ffb71de733069a946e7d186 Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Wed, 19 Jun 2024 23:03:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E9=BB=98=E8=AE=A4sn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SystemUserServiceImpl.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) 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 38b9bd76a..e1b4df9ca 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 @@ -29,12 +29,10 @@ import com.zhgd.xmgl.modules.basicdata.mapper.*; import com.zhgd.xmgl.modules.basicdata.service.IBaseMenuService; import com.zhgd.xmgl.modules.basicdata.service.ICompanyService; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; -import com.zhgd.xmgl.modules.checking.entity.CheckingPoint; import com.zhgd.xmgl.modules.checking.entity.CheckingPointInfo; import com.zhgd.xmgl.modules.checking.entity.XzCheckingRoute; import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; import com.zhgd.xmgl.modules.checking.service.CheckingPointInfoService; -import com.zhgd.xmgl.modules.checking.service.CheckingPointService; import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteService; import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteTaskService; import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionDev; @@ -48,7 +46,6 @@ import com.zhgd.xmgl.modules.quality.mapper.QualityRegionMapper; import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDevMapper; -import com.zhgd.xmgl.modules.security.service.ISecurityCheckPointsService; import com.zhgd.xmgl.modules.worker.entity.UserEnterprise; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; @@ -57,7 +54,6 @@ import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl; import com.zhgd.xmgl.modules.xz.entity.XzRegistry; import com.zhgd.xmgl.modules.xz.mapper.XzRegistryMapper; import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskRecordService; import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.service.impl.XzRegistryServiceImpl; import com.zhgd.xmgl.security.JwtTokenProvider; @@ -68,12 +64,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.HistoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.TaskService; import org.flowable.engine.history.HistoricProcessInstance; -import org.flowable.engine.history.HistoricProcessInstanceQuery; -import org.flowable.engine.runtime.ProcessInstance; -import org.flowable.task.api.Task; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; @@ -92,7 +83,8 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; -import static com.zhgd.xmgl.constant.Cts.*; +import static com.zhgd.xmgl.constant.Cts.DEFAULT; +import static com.zhgd.xmgl.constant.Cts.QUERY_TYPE; /** * @Description: 账号 @@ -343,7 +335,7 @@ public class SystemUserServiceImpl extends ServiceImpl() .eq(XzSystemUserToCompanyProject::getType, 2) .eq(XzSystemUserToCompanyProject::getUserId, systemUser.getUserId())