From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserService/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/UserService/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java b/UserService/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java
index 78da43b..fba1f6e 100644
--- a/UserService/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java
+++ b/UserService/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java
@@ -1,11 +1,11 @@
package com.java110.user.smo.impl;
import com.java110.dto.PageDto;
-import com.java110.dto.org.OrgDto;
+import com.java110.dto.user.UserAttrDto;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.smo.user.IUserInnerServiceSMO;
-import com.java110.dto.UserDto;
+import com.java110.dto.user.UserDto;
import com.java110.user.dao.IUserServiceDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -68,7 +68,6 @@
}
-
@Override
public int getUserCount(@RequestBody UserDto userDto) {
@@ -87,8 +86,41 @@
List<UserDto> staffs = BeanConvertUtil.covertBeanList(userServiceDaoImpl.getUsers(BeanConvertUtil.beanCovertMap(userDto)), UserDto.class);
+ freshUserAttrs(staffs);
+ return staffs;
+ }
+
+ @Override
+ public List<UserDto> getUserHasPwd(@RequestBody UserDto userDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+ List<UserDto> staffs = BeanConvertUtil.covertBeanList(userServiceDaoImpl.getUserHasPwd(BeanConvertUtil.beanCovertMap(userDto)), UserDto.class);
return staffs;
+
+ }
+
+ private void freshUserAttrs(List<UserDto> userDtos) {
+
+ Map param = null;
+ for (UserDto userDto : userDtos) {
+ param = new HashMap();
+ param.put("userId",userDto.getUserId());
+ List<UserAttrDto> userAttrDtos = BeanConvertUtil.covertBeanList(userServiceDaoImpl.queryUserInfoAttrs(param), UserAttrDto.class);
+ if(userAttrDtos == null || userAttrDtos.size() == 0){
+ continue;
+ }
+ userDto.setUserAttrs(userAttrDtos);
+ for(UserAttrDto userAttrDto : userAttrDtos){
+ //openId 鍗曠嫭鍑烘潵澶勭悊
+ if("100201911001".equals(userAttrDto.getSpecCd())){
+ userDto.setOpenId(userAttrDto.getValue());
+ }
+ }
+
+
+ }
+
+
}
--
Gitblit v1.8.0