From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
index 1b605ea..b9df000 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
@@ -1,19 +1,15 @@
package com.moral.api.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.config.Interceptor.UserHelper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.SysDictData;
import com.moral.api.entity.SysDictType;
import com.moral.api.mapper.SysDictTypeMapper;
import com.moral.api.pojo.enums.SysDictTypeEnum;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.SysDictTypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.constant.Constants;
-
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.web.config.QuerydslWebConfiguration;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -62,7 +58,7 @@
public List<Integer> dateValueList(String code) {
QxUser user = UserHelper.getCurrentUser();
List<Integer> integerList = new ArrayList<>();
- SysDictData listSys = this.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER_RANGE.getValue(),user.getUserId().toString());
+ SysDictData listSys = this.listOne(code,user.getUserId().toString());
if(listSys.getDataValue().contains(",")){
List<Integer> resultStr = Arrays.asList(listSys.getDataValue().split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
integerList.addAll(resultStr);
--
Gitblit v1.8.0