Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java

@@ -58,6 +58,8 @@ public interface SystemUserMapper extends BaseMapper<SystemUser> {
 
     List<SystemUser> getTenantListBySn(@Param("map") Map<String, Object> map);
 
+    List<SystemUser> selectDetailByUserIds(@Param("userIds") Collection<String> userIds);
+
     /**
      * 查询该部门下的所有用户
      *

src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml

@@ -194,6 +194,20 @@
         group by `real_name`
         HAVING COUNT(real_name) = 1
     </select>
+
+    <select id="selectDetailByUserIds" resultType="com.zhgd.xmgl.modules.basicdata.entity.SystemUser">
+        select u.user_id, u.real_name, u.avatar, p.dept_name projectOrgName, r.role_name from system_user u
+            left join xz_project_org p on u.xz_project_org_id = p.id
+            left join base_role_user ur on u.user_id = ur.user_id
+            left join base_role r on r.role_id = ur.role_id
+        <if test="userIds != null and userIds.size() != 0">
+            where u.user_id in
+            <foreach collection="userIds" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
     <resultMap id="zjwjUserPage" type="com.zhgd.xmgl.modules.basicdata.entity.SystemUser" autoMapping="true">
         <id column="user_id" property="userId"/>
         <association property="workerInfo" javaType="com.zhgd.xmgl.modules.worker.entity.WorkerInfo" autoMapping="true">

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java

@@ -9,9 +9,7 @@ import com.wflow.bean.do_.DeptDo;
 import com.wflow.bean.do_.RoleDo;
 import com.wflow.bean.do_.UserDeptDo;
 import com.wflow.bean.do_.UserDo;
-import com.wflow.bean.entity.WflowModelHistorys;
+import com.wflow.bean.entity.*;
-import com.wflow.bean.entity.WflowModelPerms;
-import com.wflow.bean.entity.WflowModels;
 import com.wflow.bean.vo.ModelGroupVo;
 import com.wflow.bean.vo.OrgTreeVo;
 import com.wflow.bean.vo.UserVo;
@@ -19,6 +17,7 @@ import com.wflow.mapper.WflowModelPermsMapper;
 import com.wflow.mapper.WflowModelsMapper;
 import com.wflow.service.OrgRepositoryService;
 import com.wflow.workflow.bean.dto.NotifyDto;
+import com.wflow.workflow.bean.process.OrgUser;
 import com.zhgd.xmgl.modules.basicdata.entity.BaseRole;
 import com.zhgd.xmgl.modules.basicdata.entity.BaseRoleUser;
 import com.zhgd.xmgl.modules.basicdata.entity.Company;
@@ -143,10 +142,10 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
     }
 
     @Override
-    public List<UserDo> getUsersBatch(Collection<String> userIds) {
+    public List<OrgUser> getUsersBatch(Collection<String> userIds) {
         try {
-            return systemUserMapper.selectBatchIds(userIds).stream()
+            return systemUserMapper.selectDetailByUserIds(userIds).stream()
-                    .map(u -> new UserDo(u.getUserId().toString(), u.getRealName(), u.getAvatar()))
+                    .map(u -> new OrgUser(u.getUserId().toString(), u.getRealName(), u.getAvatar(), "", null, u.getRoleName(), u.getProjectOrgName()))
                     .collect(Collectors.toList());
         } catch (Exception e) {
             return Collections.emptyList();
@@ -268,7 +267,22 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
 
     @Override
     public UserVo getUserDetail(String userId) {
-        return null;
+        SystemUser user = systemUserMapper.selectById(userId);
+        List<DeptDo> depts = getDeptsByUser(userId);
+        BaseRole roles = systemRoleMapper.selectRoleByUserId(user.getUserId());
+        List<String> roleList = new ArrayList<>();
+        roleList.add(roles.getRoleName());
+        return UserVo.builder()
+                .userId(userId)
+                .username(user.getRealName())
+//                .sex(user.getSex())
+                .avatar(user.getAvatar())
+//                .entryDate(user.getEntryDate())
+//                .leaveDate(user.getLeaveDate())
+                .positions(Collections.emptyList())
+                .depts(depts.stream().map(DeptDo::getDeptName).collect(Collectors.toList()))
+                .roles(roleList)
+                .build();
     }
 
     @Override