仓库管理——管理员的逻辑修改

controllers/secondary_order_api_contorller.go

 func (this *SecondaryOrderApiController) GetuserName() {
 	adminUserInfo := this.GetAdminUserInfo()
 	viewModels, _, _ := service.GetAdminUsersAndLoginInfo(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, 1, 100)
+	c, _ := service.Getcreateid(adminUserInfo.CurrentOrgId)
+	//c.Creator
+	admin := []*service.AdminUserManageViewModel{} //记录当前管理员的信息
 	//去除禁用的角色
 	tmp := []*service.AdminUserManageViewModel{}
 	for i := 0; i < len(viewModels); i++ {
 		if viewModels[i].Status == 1 {
 			tmp = append(tmp, viewModels[i])
 		}
+		if int64(viewModels[i].AdminUserId) == c.Creator {
+			admin = append(admin, viewModels[i])
+		}
 	}
 	roles := service.FindRoles(adminUserInfo.CurrentOrgId)
 	//去除没有权限的角色
 			tmplist = append(tmplist, tmp[i])
 		}
 	}
+	isappend := true //判断结果中是否添加机构创建者，true添加，false不添加
+	if len(tmplist) > 0 {
+		for i := 0; i < len(tmplist); i++ {
+			if int64(tmplist[i].AdminUserId) == c.Creator {
+				isappend = false
+			}
+		}
+	}
+	if isappend {
+		tmplist = append(tmplist, admin...)
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": tmplist,
 	})