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

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -21,6 +21,7 @@ type HomeController struct {
 }
 
 func (this *HomeController) GetHomeData() {
+
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	if adminUserInfo.Org != nil && adminUserInfo.Org.Id != 0 {
 		//获取该管理员所有机构列表
@@ -72,13 +73,14 @@ func (this *HomeController) GetHomeData() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
-
+		cretor := adminUserInfo.AdminUser.Id
 		this.ServeSuccessJSON(map[string]interface{}{
 			"orgs":            orgs,
 			"apps":            apps,
 			"banners":         banners,
 			"isCreateOrg":     true,
 			"isSubSuperAdmin": isSubSuperAdmin,
+			"cretor":          cretor,
 		})
 	} else {
 		apps, err := service.GetAllApp(0)
@@ -713,3 +715,20 @@ func RemoveRepeatedPurviewElement2(arr []string) (newArr []string) {
 	}
 	return
 }
+
+func RemoveRepeatedOrgElementTwo(orgs []*models.SgjUserOrg) (newOrgs []*models.SgjUserOrg) {
+	newOrgs = make([]*models.SgjUserOrg, 0)
+	for i := 0; i < len(orgs); i++ {
+		repeat := false
+		for j := i + 1; j < len(orgs); j++ {
+			if orgs[i].ID == orgs[j].ID {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newOrgs = append(newOrgs, orgs[i])
+		}
+	}
+	return
+}

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2501,3 +2501,18 @@ func (this *NewDialysisApiController) SumitForm() {
 		return
 	}
 }
+
+func (this *NewDialysisApiController) GetRolePosition() {
+
+	adminInfo := this.GetAdminUserInfo()
+	cretor := adminInfo.AdminUser.Id
+	cretorPosition, err := service.GetRolePosition(cretor)
+	fmt.Println("cretorPosition", cretorPosition.RoleName)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"cretorPosition": cretorPosition,
+	})
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -151,4 +151,5 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getmyinformationfour", &NewDialysisApiController{}, "Get:GetMyInformationFour")
 	beego.Router("/m/api/org/getMyMobile", &NewDialysisApiController{}, "Get:GetMyMobile")
 	beego.Router("/m/api/patient/sumitform", &NewDialysisApiController{}, "Get:SumitForm")
+	beego.Router("/m/api/patient/getroleposition", &NewDialysisApiController{}, "Get:GetRolePosition")
 }

models/patient_models.go

@@ -839,3 +839,23 @@ func (KyActivityTable) TableName() string {
 
 	return "ky_activity_table"
 }
+
+type SgjUserRole struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	RoleName         string `gorm:"column:role_name" json:"role_name" form:"role_name"`
+	RoleIntroduction string `gorm:"column:role_introduction" json:"role_introduction" form:"role_introduction"`
+	Creator          int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId            int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	IsSuperAdmin     int64  `gorm:"column:is_super_admin" json:"is_super_admin" form:"is_super_admin"`
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime            int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number           int64  `gorm:"column:number" json:"number" form:"number"`
+	IsSystem         int64  `gorm:"column:is_system" json:"is_system" form:"is_system"`
+}
+
+func (SgjUserRole) TableName() string {
+
+	return "sgj_user_role"
+}

service/manage_service.go

@@ -1086,3 +1086,9 @@ func CreateTable(table *models.KyActivityTable) error {
 	err := UserWriteDB().Model(&table).Create(&table).Error
 	return err
 }
+
+func GetRolePosition(id int64) (models.SgjUserRole, error) {
+	role := models.SgjUserRole{}
+	err := UserReadDB().Where("id = ? And status =1", id).Find(&role).Error
+	return role, err
+}