|
@@ -3,9 +3,12 @@ package org.jeecg.modules.wps.service.impl;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import org.jeecg.modules.system.entity.SysUser;
|
|
|
+import org.jeecg.modules.system.service.ISysUserService;
|
|
|
import org.jeecg.modules.wps.mapper.WpsUserMapper;
|
|
|
import org.jeecg.modules.wps.entity.WpsUser;
|
|
|
import org.jeecg.modules.wps.service.IWpsUserService;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
@@ -22,6 +25,8 @@ import java.util.Map;
|
|
|
@Service
|
|
|
public class WpsUserServiceImpl extends ServiceImpl<WpsUserMapper, WpsUser> implements IWpsUserService {
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ISysUserService sysUserService;
|
|
|
@Override
|
|
|
public Map<String,Object> userInfo(JSONObject reqObj){
|
|
|
List<String> ids = null;
|
|
@@ -35,10 +40,12 @@ public class WpsUserServiceImpl extends ServiceImpl<WpsUserMapper, WpsUser> impl
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
List<WpsUser> users = new ArrayList<>();
|
|
|
if(ids != null && !ids.isEmpty()) {
|
|
|
- WpsUser user;
|
|
|
for (String id : ids) {
|
|
|
- user = this.getById(id);
|
|
|
- if (user != null){
|
|
|
+ SysUser getUser = sysUserService.getById(id);
|
|
|
+ if (getUser != null){
|
|
|
+ WpsUser user = new WpsUser();
|
|
|
+ user.setId(getUser.getId());
|
|
|
+ user.setName(getUser.getRealname());
|
|
|
users.add(user);
|
|
|
}
|
|
|
}
|