From 0a8b731d9cf46c78c0c4c66fa9954eeb262e4017 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Mon, 10 Aug 2020 09:20:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDictionariesServiceImpl.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDictionariesServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDictionariesServiceImpl.java
index f53f2a7..56ef37f 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDictionariesServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDictionariesServiceImpl.java
@@ -1,26 +1,20 @@
package com.kidgrow.usercenter.service.impl;
-import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.usercenter.mapper.SysDictionariesMapper;
+import com.kidgrow.usercenter.model.SysDictionaries;
+import com.kidgrow.usercenter.service.ISysDictionariesService;
import com.kidgrow.usercenter.vo.SysDictionariesVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service;
-import com.kidgrow.common.model.PageResult;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kidgrow.common.service.impl.SuperServiceImpl;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import org.apache.commons.collections4.MapUtils;
-import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.usercenter.model.SysDictionaries;
-import com.kidgrow.usercenter.mapper.SysDictionariesMapper;
-import com.kidgrow.usercenter.service.ISysDictionariesService;
+import java.util.*;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -49,9 +43,11 @@
BeanCopier beanCopier = BeanCopier.create(SysDictionaries.class, SysDictionariesVo.class, false);
beanCopier.copy(dictionaries,sysDictionariesVo,null);
if(StringUtils.isNotBlank(dictionaries.getDictionariesClassId())){
- SysDictionaries dic = baseMapper.selectById(dictionaries.getDictionariesClassId());
- if(dic!=null){
- sysDictionariesVo.setDictionariesClassName(dic.getDictionariesName());
+ Map<String, Object> paramsTemp=new HashMap<>();
+ paramsTemp.put("dictionaries_key",dictionaries.getDictionariesClassId());
+ List<SysDictionaries> dicList = baseMapper.selectByMap(paramsTemp);
+ if(dicList!=null&&dicList.size()>0){
+ sysDictionariesVo.setDictionariesClassName(dicList.get(0).getDictionariesName());
}
}
listvo.add(sysDictionariesVo);
--
Gitblit v1.8.0