Merge branch '20211122' of http://git.shengws.com/csx/XT_New into 20211122

controllers/secondary_order_api_contorller.go

 func (this *SecondaryOrderApiController) GetuserName() {
 	adminUserInfo := this.GetAdminUserInfo()
 	viewModels, _, _ := service.GetAdminUsersAndLoginInfo(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, 1, 100)
+	//viewModels, _, _ := service.GetAdminUsersAndLoginInfo(10164, 12123, 1, 100)
 	c, _ := service.Getcreateid(adminUserInfo.CurrentOrgId)
+	//c, _ := service.Getcreateid(10164)
 	//c.Creator
 	admin := []*service.AdminUserManageViewModel{} //记录当前管理员的信息
 	//去除禁用的角色
 		}
 	}
 	roles := service.FindRoles(adminUserInfo.CurrentOrgId)
+	//roles := service.FindRoles(10164)
 	//去除没有权限的角色
 	tmplist := []*service.AdminUserManageViewModel{}
 	if roles == nil || len(roles) == 0 {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": tmplist,
+			"list": admin,
 		})
 		return
 	}

models/secondary_models.go

 	StorehouseOutId     int64  `gorm:"column:storehouse_out_id" json:"storehouse_out_id" form:"storehouse_out_id"`
 	StorehouseAdminName string `gorm:"column:storehouse_admin_name" json:"storehouse_admin_name" form:"storehouse_admin_name"`
 }
+
+type PurviewTmp struct {
+	Id                  int64      `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	Parentid            int64      `json:"pid"`                                                // 父级ID
+	Module              int8       `json:"module"`                                             // 所属应用类型 1.病友经营；2.科普号；3.血透经营；4.慢病管理；
+	Name                string     `json:"name"`                                               // 规则名称（也是菜单名）
+	Urlfor              string     `json:"urlfor"`                                             // 规则唯一英文标识，(Controller.Method)
+	MenuIconClass       string     `gorm:"menu_icon_class" json:"menu_icon_class"`             // 菜单图标的 css 样式
+	SuperAdminExclusive int8       `gorm:"super_admin_exclusive" json:"super_admin_exclusive"` // 是否为超级管理员专属 0否1是
+	Listorder           int        `json:"-"`                                                  // 排序ID
+	Status              int8       `json:"status"`                                             // 状态 0.无效 1.有效 2.禁用
+	CreateTime          int64      `gorm:"column:ctime" json:"-"`                              // 创建时间
+	ModifyTime          int64      `gorm:"column:mtime" json:"-"`                              // 修改时间
+	Purview             []*Purview `gorm:"ForeignKey:Parentid;AssociationForeignKey:ID" json:"sub_purview"`
+	IconUrl             string     `gorm:"column:icon_url" json:"icon_url" form:"icon_url"`
+	Desc                string     `gorm:"column:desc" json:"desc" form:"desc"`
+	ParentUrl           string     `gorm:"column:parent_url" json:"parent_url" form:"parent_url"`
+	Link                string     `gorm:"-" json:"link"`   // urlfor 解析后的链接
+	Childs              []*Purview `gorm:"-" json:"childs"` // 子节点
+}
+
+func (PurviewTmp) TableName() string {
+	return "sgj_users.sgj_user_purview"
+}

service/secondary_service.go

 //根据机构id查询拥有仓库管理权限的角色
 func FindRoles(orgid int64) map[string]int {
 	role := []models.RolePurviews{}
+	tmp := models.PurviewTmp{}
 	roles := make(map[string]int)
-	XTReadDB().Select("role_id").Where("purview_ids like \"%299%\" and org_id = ? and status = 1", orgid).Find(&role)
+	//查询sgj_user_purview表条件是urlfor="/stock/warehousequery" and name="仓库管理"
+	XTReadDB().Select("id").Where("urlfor=\"/stock/warehousequery\" and name=\"仓库管理\"").Find(&tmp)
+	tmpstring := "%" + fmt.Sprint(tmp.Id) + "%"
+	XTReadDB().Select("role_id").Where("purview_ids like ? and org_id = ? and status = 1", tmpstring, orgid).Find(&role)
 	for i := 0; i < len(role); i++ {
 		roles[strconv.FormatInt(role[i].RoleId, 10)] = i
 	}