角色关联用户修改

 FROM 192.168.0.243:5000/mmm/allied-creation-user:20210809
 FROM 192.168.0.243:5000/mmm/allied-creation-user:20210809
-ENV APP_DIR $GOPATH/src/project
+ENV APP_DIR $GOPATH/src/project-20210825
 RUN mkdir -p $APP_DIR
 RUN mkdir -p $APP_DIR
 WORKDIR $APP_DIR/
 WORKDIR $APP_DIR/
 COPY ./pkg pkg
 COPY ./pkg pkg

@@ -218,10 +218,11 @@ func (roleService *RoleService) GetRoleRelatedUsers(getRoleRelatedUsersQuery *qu
 	}
 	}
 	queryOptions := make(map[string]interface{})
 	queryOptions := make(map[string]interface{})
 	queryOptions["companyId"] = role.CompanyId
 	queryOptions["companyId"] = role.CompanyId
-	queryOptions["organizationId"] = getRoleRelatedUsersQuery.OperateInfo.GetOrgId(getRoleRelatedUsersQuery.OrgId)
+	queryOptions["organizationId"] = getRoleRelatedUsersQuery.OrgId
 	if getRoleRelatedUsersQuery.DepartmentId > 0 {
 	if getRoleRelatedUsersQuery.DepartmentId > 0 {
 		queryOptions["departmentId"] = getRoleRelatedUsersQuery.DepartmentId
 		queryOptions["departmentId"] = getRoleRelatedUsersQuery.DepartmentId
 	}
 	}
+	queryOptions["userType"] = domain.UserTypeEmployee
 	_, users, err := userRepository.Find(queryOptions)
 	_, users, err := userRepository.Find(queryOptions)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())