From 04051af6a3115d73dab6935d06ebd70334484962 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 14:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into cjl
---
screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 c1fb0e1..ae05d84 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,9 +1,13 @@
package com.moral.api.service.impl;
+import com.moral.api.config.Interceptor.UserHelper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.config.Interceptor.UserHelper;
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;
@@ -13,7 +17,11 @@
import org.springframework.data.web.config.QuerydslWebConfiguration;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -52,6 +60,21 @@
}
@Override
+ 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());
+ if(listSys.getDataValue().contains(",")){
+ List<Integer> resultStr = Arrays.asList(listSys.getDataValue().split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
+ integerList.addAll(resultStr);
+ }else {
+ Integer dataValue = Objects.nonNull(listSys.getDataValue())?Integer.parseInt(listSys.getDataValue()):0;
+ integerList.add(dataValue);
+ }
+ return integerList;
+ }
+
+ @Override
public SysDictType slectFind(String name) {
SysDictType sysDictType = this.baseMapper.selectFind(name);
return sysDictType;
--
Gitblit v1.8.0