仓库管理bug修改

controllers/secondary_order_api_contorller.go

@@ -35,6 +35,7 @@ func SecondaryOrderApiRegistRouters() {
 	beego.Router("/api/secondary/updatedrugout", &SecondaryOrderApiController{}, "get:UpdateDrugOut")               //更改药品自动出库仓库
 	beego.Router("/api/secondary/getusername", &SecondaryOrderApiController{}, "get:GetuserName")                   //获取仓库管理员信息
 	beego.Router("/api/secondary/byliinit", &SecondaryOrderApiController{}, "get:Byliinit")                         //初始化旧数据
+	beego.Router("/api/secondary/getcreaterid", &SecondaryOrderApiController{}, "get:GetCreaterId")                 //获取当前登录的人的id
 	beego.Router("/api/secondary/ttttt", &SecondaryOrderApiController{}, "get:TTTTT")
 
 }
@@ -642,8 +643,45 @@ func (this *SecondaryOrderApiController) Byliinit() {
 func (this *SecondaryOrderApiController) GetuserName() {
 	adminUserInfo := this.GetAdminUserInfo()
 	viewModels, _, _ := service.GetAdminUsersAndLoginInfo(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, 1, 100)
+	//去除禁用的角色
+	tmp := []*service.AdminUserManageViewModel{}
+	for i := 0; i < len(viewModels); i++ {
+		if viewModels[i].Status == 1 {
+			tmp = append(tmp, viewModels[i])
+		}
+	}
+	roles := service.FindRoles(adminUserInfo.CurrentOrgId)
+	//去除没有权限的角色
+	tmplist := []*service.AdminUserManageViewModel{}
+	if roles == nil || len(roles) == 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": tmplist,
+		})
+		return
+	}
+	for i := 0; i < len(tmp); i++ {
+		boolean := false
+		//获取并解析当前用户的角色
+		tmproles := strings.Split(tmp[i].RoleIds, ",")
+		for j := 0; j < len(tmproles); j++ {
+			//判断这些角色是否有权限
+			if _, ok := roles[tmproles[j]]; ok {
+				boolean = true
+			}
+		}
+		if boolean {
+			tmplist = append(tmplist, tmp[i])
+		}
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": viewModels,
+		"list": tmplist,
 	})
+	return
+}
 
+func (this *SecondaryOrderApiController) GetCreaterId() {
+	creater := this.GetAdminUserInfo().AdminUser.Id
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": creater,
+	})
 }

controllers/self_drug_api_congtroller.go

@@ -2597,7 +2597,7 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 func (this *SelfDrugApiController) GetDamageByDrugId() {
 
 	drug_id, _ := this.GetInt64("drug_id")
-	warehousing_order := this.GetString("warehousing_order")
+	warehousing_order := this.GetString("warehouseing_order")
 	drug_type, _ := this.GetInt64("type")
 	list, err := service.GetDamageByDrugId(drug_id, warehousing_order, drug_type)
 	if err != nil {

models/secondary_models.go

@@ -69,3 +69,19 @@ type Storehouselist struct {
 	Ctime               int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime               int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 }
+
+type RolePurviews struct {
+	Id         int64 `gorm:"PRIMARY_KEY;AUTO_INCREMENT"`
+	RoleId     int64
+	OrgId      int64
+	AppId      int64
+	PurviewIds string `gorm:"column:purview_ids"`
+	Status     int8   // 状态 0.无效 1.有效 2.禁用
+	CreateTime int64  `gorm:"column:ctime"` // 创建时间
+	ModifyTime int64  `gorm:"column:mtime"` // 修改时间
+	Role       Role   `gorm:"ForeignKey:RoleId;AssociationForeignKey:ID" json:"role_info"`
+}
+
+func (RolePurviews) TableName() string {
+	return "sgj_users.sgj_user_role_purview"
+}

service/secondary_service.go

@@ -713,3 +713,14 @@ func Getcreateid(orgid int64) (createid models.UserOrg, err error) {
 	err = XTReadDB().Select("id,creator").Where("id = ? and status = 1", orgid).Find(&createid).Error
 	return
 }
+
+//根据机构id查询拥有仓库管理权限的角色
+func FindRoles(orgid int64) map[string]int {
+	role := []models.RolePurviews{}
+	roles := make(map[string]int)
+	XTReadDB().Select("role_id").Where("purview_ids like \"%299%\" and org_id = ? and status = 1", orgid).Find(&role)
+	for i := 0; i < len(role); i++ {
+		roles[strconv.FormatInt(role[i].RoleId, 10)] = i
+	}
+	return roles
+}

service/self_drug_service.go

@@ -1000,7 +1000,7 @@ func GetDrugInventoryList(keyword string, page int64, limit int64, orgid int64,
 	if endtime > 0 {
 		db = db.Where("x.start_time<=?", endtime)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.min_count,x.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.min_count,x.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Order("x.id desc").Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }