Browse Source

查询用户接口修改

gao.qiang 1 year ago
parent
commit
9c0d000056

+ 2 - 1
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/ProjectTeamController.java

@@ -180,7 +180,8 @@ public class ProjectTeamController {
     @RequestMapping("/findPrincipal")
     public ResMsg findPrincipal() {
 
-        return projectTeamApi.findPrincipal();
+        ResMsg principal = projectTeamApi.findPrincipal();
+        return principal;
     }
 
     /**

+ 4 - 1
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/ProjectTeamServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ankaibei.workFlow.webadmin.ankaibei.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.ProjectInfoEntity;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.ProjectTeamInfoEntity;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.RelevanceProjectInfoEntity;
@@ -11,6 +12,7 @@ import com.ankaibei.workFlow.webadmin.ankaibei.mapper.RelevanceProjectInfoMapper
 import com.ankaibei.workFlow.webadmin.ankaibei.mapper.UserInfoMapper;
 import com.ankaibei.workFlow.webadmin.ankaibei.service.ProjectTeamService;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.ResMsg;
+import com.ankaibei.workFlow.webadmin.ankaibei.vo.WorkSysUserVo;
 import com.ankaibei.workFlow.webadmin.upms.controller.SysUserController;
 import com.ankaibei.workFlow.webadmin.upms.vo.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
@@ -156,7 +158,8 @@ public class ProjectTeamServiceImpl implements ProjectTeamService {
     @Override
     public ResMsg findPrincipal() {
         List<Map<String, String>> byUserDutyEquals = userInfoMapper.getProUserAll();
-        return new ResMsg(CodeEnum.OK, byUserDutyEquals);
+        List<WorkSysUserVo> workSysUserVoList = JSON.parseArray(JSON.toJSONString(byUserDutyEquals), WorkSysUserVo.class);
+        return new ResMsg(CodeEnum.OK, workSysUserVoList);
     }
 
     @Override

+ 15 - 0
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/vo/WorkSysUserVo.java

@@ -0,0 +1,15 @@
+package com.ankaibei.workFlow.webadmin.ankaibei.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class WorkSysUserVo implements Serializable {
+
+    private String userId;
+    private String userName;
+}