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

conf/app.conf

@@ -139,7 +139,7 @@ aliquid = 83
 
 
 [dev]
-mobile_token_expiration_second =3600
+mobile_token_expiration_second = 3600
 httpdomain = http://api.xt.test.sgjyun.com
 sso_domain = https://testsso.sgjyun.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
@@ -148,24 +148,28 @@ readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
+//readmysqlname = test_xt
 readmysqlname = sgj_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
+//writemysqlname = test_xt
 writemysqlname = sgj_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
+//readusername = test_users
 readusername = sgj_users
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
+//writeusername = test_users
 writeusername = sgj_users
 
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2197,9 +2197,7 @@ func (this *NewDialysisApiController) EditOrg() {
 }
 
 func (this *NewDialysisApiController) GetMyInforName() {
-
 	id, _ := this.GetInt64("id")
-	//Rolename, err := service.GetMyInfoName(id)
 	Username, err := service.GetAdminName(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -2210,6 +2208,22 @@ func (this *NewDialysisApiController) GetMyInforName() {
 	})
 }
 
+func (this *NewDialysisApiController) GetMyInformationFour() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	creatId := adminUserInfo.AdminUser.Id
+	fmt.Println("创建者ID", creatId)
+	orgid := adminUserInfo.Org.Id
+	fmt.Println("orgid", orgid)
+	Username, err := service.GetMyOrgInformationFour(creatId, orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"Username": Username,
+	})
+}
+
 func (this *NewDialysisApiController) GetPartionDetail() {
 	id, _ := this.GetInt64("id")
 	partionDetail, err := service.GetPartionDetail(id)
@@ -2315,6 +2329,7 @@ func (this *NewDialysisApiController) GetMyOrgInformation() {
 	fmt.Println("cretor", creator)
 	adminInfo := this.GetMobileAdminUserInfo()
 	appId := adminInfo.App.Id
+	//fmt.Println("appid------------------------------------",appId)
 	information, err := service.GetMyOrgInformation(creator, appId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -147,4 +147,5 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getmyorginformation", &NewDialysisApiController{}, "Get:GetMyOrgInformation")
 	beego.Router("/m/api/patient/savenametwo", &NewDialysisApiController{}, "Get:SaveNameTwo")
 	beego.Router("/m/api/patient/getcurrentorg", &NewDialysisApiController{}, "Get:GetCurrentOrg")
+	beego.Router("/m/api/patient/getmyinformationfour", &NewDialysisApiController{}, "Get:GetMyInformationFour")
 }

service/patientmanage_service.go

@@ -1261,6 +1261,12 @@ func GetAdminName(id int64) (models.AdminUsers, error) {
 	return user, err
 }
 
+func GetMyOrgInformationFour(creator int64, orgid int64) (models.SgjUserAdminRole, error) {
+	role := models.SgjUserAdminRole{}
+	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and status = 1", creator, orgid).Find(&role).Error
+	return role, err
+}
+
 func GetPartionDetail(id int64) (models.DeviceZone, error) {
 
 	zone := models.DeviceZone{}