Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

+package dto
+
+import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
+
+type DepartmentUsersDto struct {
+	Departments []*Department `json:"departments"`
+}
+
+type Department struct {
+	DepartmentID   int64  `json:"departmentId"`
+	DepartmentName string `json:"departmentName"`
+	Users          []User `json:"users"`
+}
+type User struct {
+	UserID   int    `json:"userId"`
+	UserName string `json:"userName"`
+}
+
+func (dto *DepartmentUsersDto) LoadDto(subDepartment *allied_creation_user.DataOrgGetSubDepartment, userSearch *allied_creation_user.DataUserSearch) error {
+	var mapDepartment = make(map[int64]*Department)
+
+	for i := range subDepartment.Orgs {
+		org := subDepartment.Orgs[i]
+		dep := &Department{
+			DepartmentID:   int64(org.OrgID),
+			DepartmentName: org.OrgName,
+			Users:          make([]User, 0),
+		}
+		dto.Departments = append(dto.Departments, dep)
+		mapDepartment[dep.DepartmentID] = dep
+	}
+
+	for i := range userSearch.Users {
+		user := userSearch.Users[i]
+		if user.Department == nil {
+			continue
+		}
+		if v, ok := mapDepartment[int64(user.Department.DepartmentId)]; ok {
+			v.Users = append(v.Users, User{
+				UserID:   user.UserId,
+				UserName: user.UserInfo.UserName,
+			})
+		}
+	}
+	return nil
+}

+package query
+
+import (
+	"fmt"
+	"github.com/beego/beego/v2/core/validation"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
+)
+
+//获取自定义菜单列表
+type DepartmentsUsersQuery struct {
+	//操作人
+	Operator domain.Operator `json:"-"`
+}
+
+func (departmentsUsersQuery *DepartmentsUsersQuery) Valid(validation *validation.Validation) {
+
+}
+
+func (departmentsUsersQuery *DepartmentsUsersQuery) ValidateQuery() error {
+	valid := validation.Validation{}
+	b, err := valid.Valid(departmentsUsersQuery)
+	if err != nil {
+		return err
+	}
+	if !b {
+		for _, validErr := range valid.Errors {
+			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
+		}
+	}
+	return nil
+}

+package service
+
+import (
+	"github.com/linmadan/egglib-go/core/application"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/org/dto"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/org/query"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
+)
+
+type OrgService struct {
+}
+
+//DepartmentsUsers 部门用户列表
+func (srv OrgService) DepartmentsUsers(departmentsUsersQuery *query.DepartmentsUsersQuery) (interface{}, error) {
+	creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(
+		departmentsUsersQuery.Operator)
+	orgs, err := creationUserGateway.OrgGetSubDepartment(allied_creation_user.ReqOrgGetSubDepartment{
+		OrgId: departmentsUsersQuery.Operator.OrgId,
+	})
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+
+	users, err := creationUserGateway.UserSearch(allied_creation_user.ReqUserSearch{
+		//Offset:         0,
+		//Limit:          999,
+		CompanyId:      departmentsUsersQuery.Operator.CompanyId,
+		OrganizationId: departmentsUsersQuery.Operator.OrgId,
+	})
+	if err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
+	departmentUsersDto := &dto.DepartmentUsersDto{}
+	if err := departmentUsersDto.LoadDto(orgs, users); err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
+	return departmentUsersDto, nil
+}
+
+func NewOrgService(options map[string]interface{}) *OrgService {
+	newOrgService := &OrgService{}
+	return newOrgService
+}

+package mobile_client
+
+import (
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/org/query"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/org/service"
+)
+
+type OrgController struct {
+	baseController
+}
+
+func (controller *OrgController) DepartmentUsers() {
+	orgService := service.OrgService{}
+	departmentsUsersQuery := &query.DepartmentsUsersQuery{}
+	err := controller.Unmarshal(departmentsUsersQuery)
+	if err != nil {
+		controller.Response(nil, err)
+		return
+	}
+	departmentsUsersQuery.Operator = controller.GetOperator()
+	data, err := orgService.DepartmentsUsers(departmentsUsersQuery)
+	controller.Response(data, err)
+}

+package routers
+
+import (
+	"github.com/beego/beego/v2/server/web"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/port/beego/controllers/mobile_client"
+)
+
+func init() {
+	web.Router("/v1/app/orgs/department-users", &mobile_client.OrgController{}, "Post:DepartmentUsers")
+}