Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AdminController.java

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.WxApplicationDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
@@ -23,6 +24,8 @@ import com.gic.haoban.manage.api.service.WxApplicationApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.AdminRoleVO;
+import com.gic.haoban.manage.web.vo.AdminVO;
 import com.gic.haoban.manage.web.vo.LoginVO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 
@@ -59,10 +62,27 @@ public class AdminController extends WebBaseController{
 			}
 		}
 		List<StaffDTO> list = new ArrayList<>();
+		List<AdminVO> resultList = new ArrayList<>();
 		if(!userIds.isEmpty()){
 			list = staffApiService.listByUserIdsAndWxEnterpriseId(userIds,wxEnterpriseId);
+			for (StaffDTO staffDTO : list) {
+				AdminVO vo = new AdminVO();
+				vo.setRoleId(staffDTO.getStaffId());
+				vo.setRoleName("管理员");
+				List<AdminRoleVO> roleList = new ArrayList<>();
+				List<DepartmentDTO> departmentList = staffDTO.getDepartmentList();
+				for (DepartmentDTO departmentDTO : departmentList) {
+					AdminRoleVO role = new AdminRoleVO();
+					role.setDepartmentName(departmentDTO.getDepartmentName());
+					role.setUserName(staffDTO.getStaffName());
+					role.setUserPhone(staffDTO.getPhoneNumber());
+					roleList.add(role);
+				}
+				vo.setRoleUser(roleList);
+				resultList.add(vo);
+			}
 		}
-		return resultResponse(HaoBanErrCode.ERR_1,list);
+		return resultResponse(HaoBanErrCode.ERR_1,resultList);
 	}
 
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/AdminRoleVO.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+public class AdminRoleVO implements Serializable{
+	
+	private String userName;
+	
+	private String userPhone;
+	
+	private String DepartmentName;
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getUserPhone() {
+		return userPhone;
+	}
+
+	public void setUserPhone(String userPhone) {
+		this.userPhone = userPhone;
+	}
+
+	public String getDepartmentName() {
+		return DepartmentName;
+	}
+
+	public void setDepartmentName(String departmentName) {
+		DepartmentName = departmentName;
+	}
+	
+	
+
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/AdminVO.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class AdminVO implements Serializable{
+	
+	private String roleId;
+	
+	private String roleName;
+	
+	private List<AdminRoleVO> roleUser;
+
+	public String getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(String roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public List<AdminRoleVO> getRoleUser() {
+		return roleUser;
+	}
+
+	public void setRoleUser(List<AdminRoleVO> roleUser) {
+		this.roleUser = roleUser;
+	}
+
+	
+
+}