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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = dev
+runmode = prod
 
 
 copyrequestbody = true

controllers/new_mobile_api_controllers/role.json

@@ -7,7 +7,7 @@
       "status": 1,
       "is_system": 1,
       "number": 9999,
-      "purview_ids": "71,72,70,74,75,73,48,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
       "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20039,20055,20056,20040,20041,20042,20043,20054,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,20030"
     },
     {
@@ -30,7 +30,7 @@
       "is_system": 3,
       "number": 9997,
       "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76",
-      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029"
+      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029,20055,20056,20052"
     },
     {
       "role_name": "库存",
@@ -75,7 +75,7 @@
       "status": 1,
       "is_system": 0,
       "number": 9993,
-      "purview_ids": "71,72,70,74,75,73,48,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
       "func_ids": ""
 
 

controllers/public_api_controller.go

@@ -468,7 +468,6 @@ func (c *PublicApiController) HandleData() {
 	//			continue
 	//		}
 	//
-	//
 	//		app.OrgId = apps.OrgId
 	//		app.Creator = int(org.Creator)
 	//		app.Pid = xt_temp_org_app.Id
@@ -503,26 +502,26 @@ func (c *PublicApiController) HandleData() {
 	//}
 	////护士医生
 	//app_roles2  := service.GetAllUserRoleByUserTypeOther()
-	//	//for _, item := range app_roles2{
-	//	//	var ids string
-	//	//	if len(item.RoleIds) == 0{
-	//	//		ids = strconv.FormatInt( item.RoleId,10)
-	//	//	}else{
-	//	//		ids = item.RoleIds + ","+strconv.FormatInt( item.RoleId,10)
-	//	//	}
-	//	//	if item.UserType == 2{
-	//	//		role := service.FindRoleByUserTypeOne(item.OrgId)
-	//	//		ids = ids +"," + strconv.FormatInt(role.Id,10)
-	//	//
-	//	//	} else if item.UserType == 3{
-	//	//		role := service.FindRoleByUserTypeTwo(item.OrgId)
-	//	//		ids = ids +"," + strconv.FormatInt(role.Id,10)
-	//	//	}
-	//	//	service.UpdateRoleIds(item.Id, ids)
-	//	//}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "ok",
-	})
+	//	for _, item := range app_roles2{
+	//		var ids string
+	//		if len(item.RoleIds) == 0{
+	//			ids = strconv.FormatInt( item.RoleId,10)
+	//		}else{
+	//			ids = item.RoleIds + ","+strconv.FormatInt( item.RoleId,10)
+	//		}
+	//		if item.UserType == 2{
+	//			role := service.FindRoleByUserTypeOne(item.OrgId)
+	//			ids = ids +"," + strconv.FormatInt(role.Id,10)
+	//
+	//		} else if item.UserType == 3{
+	//			role := service.FindRoleByUserTypeTwo(item.OrgId)
+	//			ids = ids +"," + strconv.FormatInt(role.Id,10)
+	//		}
+	//		service.UpdateRoleIds(item.Id, ids)
+	//	}
+	//c.ServeSuccessJSON(map[string]interface{}{
+	//	"msg": "ok",
+	//})
 
 }
 

controllers/role.json

@@ -7,7 +7,7 @@
       "status": 1,
       "is_system": 1,
       "number": 9999,
-      "purview_ids": "71,72,70,74,75,73,48,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
       "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20039,20055,20056,20040,20041,20042,20043,20054,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,20030"
     },
     {
@@ -30,7 +30,7 @@
       "is_system": 3,
       "number": 9997,
       "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76",
-      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029"
+      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029,20055,20056,20052"
     }
   ]
 }

service/app_version.go

@@ -21,7 +21,7 @@ func GetAppVersionByAppType(apptype int64) (*models.AppVersion, error) {
 
 func GetAllAppOrg() ([]*models.OrgApp, error) {
 	var app []*models.OrgApp
-	err := readUserDbT.Model(&models.OrgApp{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
+	err := readUserDb.Model(&models.OrgApp{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, nil
 	}
@@ -60,7 +60,7 @@ func GetApp() ([]*models.OrgApp, error) {
 
 func GetAppByType(orgID int64, app_type int) (*models.OrgApp, error) {
 	var apps models.OrgApp
-	err := readUserDbT.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
 	if err != nil {
 		return nil, err
 	}
@@ -68,7 +68,7 @@ func GetAppByType(orgID int64, app_type int) (*models.OrgApp, error) {
 }
 
 func CreateOrgApp(app *models.OrgApp) {
-	writeUserDbT.Create(&app)
+	writeUserDb.Create(&app)
 
 }
 
@@ -84,7 +84,7 @@ func GetAllUserRole(org_id int64) (appRole []*models.App_Role) {
 }
 
 func GetAllUserRoleByUserTypeOne(org_id int) (appRole []*models.App_Role) {
-	readUserDbT.Model(&models.App_Role{}).Where("status = 1 AND user_type = 1").Find(&appRole)
+	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND user_type = 1").Find(&appRole)
 	return
 }
 
@@ -92,7 +92,7 @@ func GetAllUserRoleByUserTypeOther() (appRole []*models.App_Role) {
 	//app, _ := GetOrgApp(int64(org_id), 3)
 
 	//if org_id == 0 {
-	readUserDbT.Model(&models.App_Role{}).Where("status = 1 AND user_type > 1").Find(&appRole)
+	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND user_type > 1").Find(&appRole)
 	//
 	//} else {
 	//	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND org_id = ?  AND user_type > 1 AND app_id = ? ", org_id, app.Id).Find(&appRole)
@@ -102,18 +102,18 @@ func GetAllUserRoleByUserTypeOther() (appRole []*models.App_Role) {
 }
 
 func FindRoleByUserTypeOne(org_id int64) (role models.Role) {
-	readUserDbT.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 2 AND role_name = '医生'", org_id).First(&role)
+	readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 2 AND role_name = '医生'", org_id).First(&role)
 	return
 }
 
 func FindRoleByUserTypeTwo(org_id int64) (role models.Role) {
-	readUserDbT.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 3 AND role_name = '护士'", org_id).First(&role)
+	readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 3 AND role_name = '护士'", org_id).First(&role)
 	return
 }
 
 func GetAllRole() ([]*models.Role, error) {
 	var app []*models.Role
-	err := readUserDbT.Model(&models.Role{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
+	err := readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, nil
 	}
@@ -124,13 +124,13 @@ func GetAllRole() ([]*models.Role, error) {
 }
 
 func UpdateRoleIds(id int64, ids string) {
-	writeUserDbT.Model(&models.App_Role{}).Where("status = 1 AND id = ?", id).Updates(map[string]interface{}{"role_ids": ids, "mtime": time.Now().Unix()})
+	writeUserDb.Model(&models.App_Role{}).Where("status = 1 AND id = ?", id).Updates(map[string]interface{}{"role_ids": ids, "mtime": time.Now().Unix()})
 
 }
 
 func GetOrgAppA(orgID int64, app_type int) (*models.OrgApp, error) {
 	var apps models.OrgApp
-	err := readUserDbT.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
 	if err != nil {
 		return nil, err
 	}
@@ -139,7 +139,7 @@ func GetOrgAppA(orgID int64, app_type int) (*models.OrgApp, error) {
 
 func GetOrgByIdB(orgID int64) (*models.Org, error) {
 	var org models.Org
-	err := readUserDbT.Model(&models.Org{}).Where("id = ?", orgID).First(&org).Error
+	err := readUserDb.Model(&models.Org{}).Where("id = ?", orgID).First(&org).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -152,7 +152,7 @@ func GetOrgByIdB(orgID int64) (*models.Org, error) {
 
 func GetOrgAppB(orgID int64, app_type int) (*models.OrgApp, error) {
 	var apps models.OrgApp
-	err := readUserDbT.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
 	if err != nil {
 		return nil, err
 	}
@@ -160,16 +160,16 @@ func GetOrgAppB(orgID int64, app_type int) (*models.OrgApp, error) {
 }
 
 func CreateOrgRoleB(role *models.Role) (err error) {
-	err = writeUserDbT.Create(&role).Error
+	err = writeUserDb.Create(&role).Error
 	return
 }
 
 func CreateRolePurviewB(purview *models.RolePurview) (err error) {
-	err = writeUserDbT.Create(&purview).Error
+	err = writeUserDb.Create(&purview).Error
 	return
 }
 
 func CreateFuncRolePurviewB(purview *models.SgjUserRoleFuncPurview) (err error) {
-	err = writeUserDbT.Create(&purview).Error
+	err = writeUserDb.Create(&purview).Error
 	return
 }