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

conf/app.conf

@@ -148,25 +148,25 @@ readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = sgj_xt
+readmysqlname = test_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = sgj_xt
+writemysqlname = test_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-readusername = sgj_users
+readusername = test_users
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-writeusername = sgj_users
+writeusername = test_users
 
 
 readmiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
@@ -208,6 +208,11 @@ writesgjpatientmysqlpass = 1Q2W3e4r!@#$
 writesgjpatientmysqlname = sgj_patient
 
 
+
+
+
+
+
 #redishost = 120.77.235.13
 #redishost = 112.74.16.180
 redishost = localhost

conf/接口.txt

@@ -0,0 +1,115 @@
+
+//新增临时
+/m/api/dialysis/dialysisPrescription?mode=1
+修改临处
+/m/api/dialysis/dialysisPrescription?mode=2
+修改他人临处
+/m/api/dialysis/dialysisPrescription?mode=3
+
+
+新增接诊评估
+/m/api/dialysis/acceptsAssessment?mode=1
+修改接诊评估
+/m/api/dialysis/acceptsAssessment?mode=2
+修改他人接诊评估
+/m/api/dialysis/acceptsAssessment?mode=3
+
+新增透前评估
+/m/api/assessmentbefore/commit?mode=1
+修改透前评估
+/m/api/assessmentbefore/commit?mode=2
+修改他人透前评估
+/m/api/assessmentbefore/commit?mode=3
+
+执行上机
+/m/api/dialysis/start?mode=1
+修改执行上机
+/m/api/startOrder/edit?mode=2
+修改他人执行上机
+/m/api/startOrder/edit?mode=3
+
+新增透析监测
+/m/api/monitor/add?mode=1
+修改透析监测
+/m/api/monitor/edit?mode=2
+修改他人透析监测
+/m/api/monitor/edit?mode=3
+删除透析监测
+/m/api/monitor/delete?mode=4
+删除他人透析监测
+/m/api/monitor/delete?mode=5
+
+执行下机
+/m/api/dialysis/finish?mode=1
+修改执行下机
+/m/api/finishOrder/edit?mode=2
+修改他人执行下机
+/m/api/finishOrder/edit?mode=3
+
+新增透后评估
+/m/api/dialysis/assessmentAfterDislysis?mode=1
+修改透后评估
+/m/api/dialysis/assessmentAfterDislysis?mode=2
+修改他人透后评估
+/m/api/dialysis/assessmentAfterDislysis?mode=3
+
+新增治疗小结
+/m/api/dialysis/treatmentSummary?mode=1
+修改治疗小结
+/m/api/dialysis/treatmentSummary?mode=2
+修改他人治疗小结
+/m/api/dialysis/treatmentSummary?mode=3
+
+新增透析临时医嘱
+/m/api/advice/creategroup?mode=1
+修改透析临时医嘱
+/m/api/advice/edit?mode=2
+修改他人透析临时医嘱
+/m/api/advice/edit?mode=3
+删除透析临时医嘱
+/m/api/newadvice/delete?mode=4
+删除他人透析临时医嘱
+/m/api/newadvice/delete?mode=5
+执行透析临时医嘱
+/m/api/advice/exec?mode=6
+核对透析临时医嘱
+/m/api/advice/check?mode=7
+修改已执行医嘱
+/m/api/advice/exec/modify?mode=8
+
+
+移动端 ： /m/api/permission/get      get 请求
+参数1: create_url
+参数2:modify_url
+
+参数3:modify_other_url
+
+参数4:del_url
+
+参数5:del_other_url
+
+参数6:exce_url
+
+参数7:check_url
+
+参数8:modify_exce_url
+参数9:module
+
+返回值1:is_has_create
+返回值2:is_has_modify
+
+返回值3:is_has_modify_other
+
+返回值4:is_has_del
+
+返回值5:is_has_del_other
+
+返回值6:is_has_exce
+
+返回值7:is_has_check
+
+返回值8:is_has_modify_exce
+
+返回值9:module
+
+

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -517,53 +517,44 @@ func InitPatientAndSchedule(org *models.Org) {
 	fmt.Print("patients", patients)
 	for _, it := range patients {
 		patientsNew := models.XtPatientsNew{
-			UserOrgId:                    org.Id,
-			CreatedTime:                  time.Now().Unix(),
-			UpdatedTime:                  time.Now().Unix(),
-			Status:                       1,
-			BloodId:                      it.ID,
-			BloodPatients:                1,
-			Name:                         it.Name,
-			Avatar:                       it.Avatar,
-			PatientType:                  it.PatientType,
-			DialysisNo:                   it.DialysisNo,
-			Source:                       it.Source,
-			Lapseto:                      it.Lapseto,
-			Gender:                       it.Gender,
-			Nation:                       it.Nation,
-			NativePlace:                  it.NativePlace,
-			MaritalStatus:                it.MaritalStatus,
-			IdCardNo:                     it.IdCardNo,
-			Birthday:                     it.Birthday,
-			ReimbursementWayId:           it.ReimbursementWayId,
-			HealthCareNo:                 it.HealthCareNo,
-			Phone:                        it.Phone,
-			HomeAddress:                  it.HomeAddress,
-			WorkUnit:                     it.WorkUnit,
-			UnitAddress:                  it.UnitAddress,
-			Children:                     it.Children,
-			IsHospitalFirstDialysis:      it.IsHospitalFirstDialysis,
-			FirstDialysisDate:            it.FirstDialysisDate,
-			FirstDialysisHospital:        it.FirstDialysisHospital,
-			PreHospitalDialysisFrequency: it.PreHospitalDialysisFrequency,
-			PreHospitalDialysisTimes:     it.PreHospitalDialysisTimes,
-			HospitalFirstDialysisDate:    it.HospitalFirstDialysisDate,
-			TotalDialysis:                it.TotalDialysis,
-			Diagnose:                     it.Diagnose,
-			Remark:                       it.Remark,
-			RegistrarsId:                 it.RegistrarsId,
-			BindingState:                 it.BindingState,
-			PatientComplains:             it.PatientComplains,
-			PresentHistory:               it.PresentHistory,
-			PastHistory:                  it.PastHistory,
-			Temperature:                  it.Temperature,
-			Pulse:                        it.Pulse,
-			Respiratory:                  it.Respiratory,
-			Age:                          it.Age,
-			IsOpenRemind:                 it.IsOpenRemind,
-			TellPhone:                    it.TellPhone,
-			FirstTreatmentDate:           it.FirstTreatmentDate,
-			ContactName:                  it.ContactName,
+			UserOrgId:               org.Id,
+			CreatedTime:             time.Now().Unix(),
+			UpdatedTime:             time.Now().Unix(),
+			Status:                  1,
+			BloodId:                 it.ID,
+			BloodPatients:           1,
+			Name:                    it.Name,
+			Avatar:                  it.Avatar,
+			PatientType:             it.PatientType,
+			Source:                  it.Source,
+			Lapseto:                 it.Lapseto,
+			Gender:                  it.Gender,
+			Nation:                  it.Nation,
+			NativePlace:             it.NativePlace,
+			MaritalStatus:           it.MaritalStatus,
+			IdCardNo:                it.IdCardNo,
+			Birthday:                it.Birthday,
+			ReimbursementWayId:      it.ReimbursementWayId,
+			HealthCareNo:            it.HealthCareNo,
+			Phone:                   it.Phone,
+			HomeAddress:             it.HomeAddress,
+			WorkUnit:                it.WorkUnit,
+			UnitAddress:             it.UnitAddress,
+			Children:                it.Children,
+			IsHospitalFirstDialysis: it.IsHospitalFirstDialysis,
+			FirstDialysisDate:       it.FirstDialysisDate,
+			BindingState:            it.BindingState,
+			PatientComplains:        it.PatientComplains,
+			PresentHistory:          it.PresentHistory,
+			PastHistory:             it.PastHistory,
+			Temperature:             it.Temperature,
+			Pulse:                   it.Pulse,
+			Respiratory:             it.Respiratory,
+			Age:                     it.Age,
+			IsOpenRemind:            it.IsOpenRemind,
+			TellPhone:               it.TellPhone,
+			FirstTreatmentDate:      it.FirstTreatmentDate,
+			ContactName:             it.ContactName,
 		}
 		service.CreateVMOrgNewPatient(&patientsNew)
 	}

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1990,6 +1990,7 @@ func (this *NewDialysisApiController) LoginOut() {
 
 	this.DelSession("mobile_admin_user_info")
 	this.Ctx.SetCookie("token_cookie", "")
+	this.Ctx.SetCookie("logout_cookie", "1")
 	id, _ := this.GetInt64("id")
 	fmt.Println("id------------------------------------------", id)
 	loginLog := models.SgjUserAdminLoginLog{

controllers/new_mobile_api_controllers/role.json

@@ -8,7 +8,7 @@
       "is_system": 1,
       "number": 9999,
       "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,94,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,76,156,157,158,159,155,82,83,108,149,154,190,81,101,100,102,161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192,81,82,83,104,106,107,108,149,154,190,191",
-      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20024,20025,20026,20027,20028,20029,20030,20031,20032,20033,20034,20035,20036,20037,20038,20039,20040,20041,20042,20043,20044,20045"
+      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20010,20011,20012,20024,20025,20026,20027,20028,20030,20034,20035,20036,20038,20039,20040,20041,20042,20043,20044,20045,20046,20047,20048,20049,20050,20054"
     },
     {
       "role_name": "医生",

controllers/public_api_controller.go

@@ -25,7 +25,7 @@ func PublicApiRegistRouters() {
 	beego.Router("/api/app/release", &PublicApiController{}, "Get:AppRelease")
 	beego.Router("/api/get", &PublicApiController{}, "Get:GetJson")
 
-	beego.Router("/api/public/handledata", &PublicApiController{}, "Post:HandleData")
+	beego.Router("/api/public/handledata", &PublicApiController{}, "get:HandleData")
 
 }
 
@@ -163,276 +163,331 @@ func (this *PublicApiController) GetJson() {
 }
 
 func (c *PublicApiController) HandleData() {
-	org_app, _ := service.GetAllAppOrg()
-	org_role, _ := service.GetAllRole()
-
-	var org_ids []int64
-
-	for _, apps := range org_app {
-		xt_org_app, _ := service.GetAppByType(int64(apps.OrgId), 3)
-		scrm_org_app, _ := service.GetAppByType(int64(apps.OrgId), 1)
-		cdm_org_app, _ := service.GetAppByType(int64(apps.OrgId), 4)
-		mall_org_app, _ := service.GetAppByType(int64(apps.OrgId), 5)
-		org_app_6, _ := service.GetAppByType(int64(apps.OrgId), 6)
-		org_app_7, _ := service.GetAppByType(int64(apps.OrgId), 7)
-		org_app_8, _ := service.GetAppByType(int64(apps.OrgId), 8)
-		org_app_9, _ := service.GetAppByType(int64(apps.OrgId), 9)
-		org_app_10, _ := service.GetAppByType(int64(apps.OrgId), 10)
-		org_app_11, _ := service.GetAppByType(int64(apps.OrgId), 11)
-		org_app_12, _ := service.GetAppByType(int64(apps.OrgId), 12)
-		org_app_13, _ := service.GetAppByType(int64(apps.OrgId), 13)
-		org_app_14, _ := service.GetAppByType(int64(apps.OrgId), 14)
-		org_app_15, _ := service.GetAppByType(int64(apps.OrgId), 15)
-
-		var xt_temp_org_app *models.OrgApp
-		var mall_temp_org_app *models.OrgApp
-
-		if xt_org_app == nil || xt_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-
-			app, _ := service.GetOrgApp(0, 3)
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.Id = 0
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Number = 0
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-			xt_temp_org_app = app
-		} else {
-
-			xt_temp_org_app = xt_org_app
-
-		}
-
-		if scrm_org_app == nil || scrm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-
-			app, _ := service.GetOrgApp(0, 1)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Id = 0
-
-			app.Creator = int(org.Creator)
-			app.Number = 0
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-
-		}
-
-		if cdm_org_app == nil || cdm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 4)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Number = 0
-			app.Id = 0
-
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-		}
-
-		if mall_org_app == nil || mall_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 5)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Number = 0
-			app.Id = 0
-
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-			mall_temp_org_app = app
-		} else {
-			mall_temp_org_app = mall_org_app
-		}
-
-		if org_app_6 == nil || org_app_6.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 6)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Number = 1
-			app.Id = 0
-
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			app.Pid = xt_temp_org_app.Id
-			service.CreateOrgApp(app)
-
-		}
-		if org_app_7 == nil || org_app_7.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 7)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Number = 0
-			app.Status = 2
-			app.Id = 0
-
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			app.Pid = xt_temp_org_app.Id
-
-			service.CreateOrgApp(app)
-		}
-		if org_app_8 == nil || org_app_8.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 8)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Number = 3
-			app.Id = 0
-
-			app.Pid = mall_temp_org_app.Id
-
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-		}
-		if org_app_9 == nil || org_app_9.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 9)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Pid = xt_temp_org_app.Id
-
-			app.Creator = int(org.Creator)
-			app.Number = 4
-			app.Id = 0
-
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-
-		}
-		if org_app_10 == nil || org_app_10.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 10)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Pid = xt_temp_org_app.Id
-
-			app.Number = 5
-			app.Id = 0
-
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-		}
-		if org_app_11 == nil || org_app_11.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 11)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = app.OrgId
-			app.Creator = int(org.Creator)
-			app.Pid = xt_temp_org_app.Id
-			app.Id = 0
-
-			app.Number = 6
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-		}
-		if org_app_12 == nil || org_app_12.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 12)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Pid = xt_temp_org_app.Id
-			app.Number = 7
-			app.Status = 1
-			app.Id = 0
-
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-		}
-		if org_app_13 == nil || org_app_13.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 13)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Pid = xt_temp_org_app.Id
-			app.Number = 8
-			app.Id = 0
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-		}
-		if org_app_14 == nil || org_app_14.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 14)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Pid = xt_temp_org_app.Id
-			app.Id = 0
-			app.Number = 9
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-		}
-
-		if org_app_15 == nil || org_app_15.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgApp(0, 15)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgById(int64(apps.OrgId))
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Pid = xt_temp_org_app.Id
-			app.Number = 10
-			app.Status = 1
-			app.Id = 0
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			service.CreateOrgApp(app)
-		}
-	}
+	//org_app, _ := service.GetAllAppOrg()
+	//org_role, _ := service.GetAllRole()
+
+	//var org_ids []int64
+
+	//for _, apps := range org_app {
+	//	xt_org_app, _ := service.GetAppByType(int64(apps.OrgId), 3)
+	//	scrm_org_app, _ := service.GetAppByType(int64(apps.OrgId), 1)
+	//	cdm_org_app, _ := service.GetAppByType(int64(apps.OrgId), 4)
+	//	mall_org_app, _ := service.GetAppByType(int64(apps.OrgId), 5)
+	//	org_app_6, _ := service.GetAppByType(int64(apps.OrgId), 6)
+	//	org_app_7, _ := service.GetAppByType(int64(apps.OrgId), 7)
+	//	org_app_8, _ := service.GetAppByType(int64(apps.OrgId), 8)
+	//	org_app_9, _ := service.GetAppByType(int64(apps.OrgId), 9)
+	//	org_app_10, _ := service.GetAppByType(int64(apps.OrgId), 10)
+	//	org_app_11, _ := service.GetAppByType(int64(apps.OrgId), 11)
+	//	org_app_12, _ := service.GetAppByType(int64(apps.OrgId), 12)
+	//	org_app_13, _ := service.GetAppByType(int64(apps.OrgId), 13)
+	//	org_app_14, _ := service.GetAppByType(int64(apps.OrgId), 14)
+	//	org_app_15, _ := service.GetAppByType(int64(apps.OrgId), 15)
+	//
+	//	var xt_temp_org_app *models.OrgApp
+	//	var mall_temp_org_app *models.OrgApp
+	//
+	//	if xt_org_app == nil || xt_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//
+	//		app, _ := service.GetOrgAppA(0, 3)
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//		app.Id = 0
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Number = 0
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//		xt_temp_org_app = app
+	//	} else {
+	//
+	//		xt_temp_org_app = xt_org_app
+	//
+	//	}
+	//
+	//	if scrm_org_app == nil || scrm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//
+	//		app, _ := service.GetOrgAppA(0, 1)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Id = 0
+	//
+	//		app.Creator = int(org.Creator)
+	//		app.Number = 0
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//
+	//	}
+	//
+	//	if cdm_org_app == nil || cdm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 4)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Number = 0
+	//		app.Id = 0
+	//
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//	}
+	//
+	//	if mall_org_app == nil || mall_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 5)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Number = 0
+	//		app.Id = 0
+	//
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//		mall_temp_org_app = app
+	//	} else {
+	//		mall_temp_org_app = mall_org_app
+	//	}
+	//
+	//	if org_app_6 == nil || org_app_6.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 6)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Number = 1
+	//		app.Id = 0
+	//
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		app.Pid = xt_temp_org_app.Id
+	//		service.CreateOrgApp(app)
+	//
+	//	}
+	//	if org_app_7 == nil || org_app_7.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 7)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Number = 2
+	//		app.Status = 2
+	//		app.Id = 0
+	//
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		app.Pid = xt_temp_org_app.Id
+	//
+	//		service.CreateOrgApp(app)
+	//	}
+	//	if org_app_8 == nil || org_app_8.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 8)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Number = 3
+	//		app.Id = 0
+	//
+	//		app.Pid = mall_temp_org_app.Id
+	//
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//	}
+	//	if org_app_9 == nil || org_app_9.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 9)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Pid = xt_temp_org_app.Id
+	//
+	//		app.Creator = int(org.Creator)
+	//		app.Number = 4
+	//		app.Id = 0
+	//
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//
+	//	}
+	//	if org_app_10 == nil || org_app_10.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 10)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Pid = xt_temp_org_app.Id
+	//
+	//		app.Number = 5
+	//		app.Id = 0
+	//
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//	}
+	//	if org_app_11 == nil || org_app_11.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 11)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Pid = xt_temp_org_app.Id
+	//		app.Id = 0
+	//
+	//		app.Number = 6
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//	}
+	//	if org_app_12 == nil || org_app_12.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 12)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Pid = xt_temp_org_app.Id
+	//		app.Number = 7
+	//		app.Status = 1
+	//		app.Id = 0
+	//
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//	}
+	//	if org_app_13 == nil || org_app_13.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 13)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Pid = xt_temp_org_app.Id
+	//		app.Number = 8
+	//		app.Id = 0
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//	}
+	//	if org_app_14 == nil || org_app_14.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 14)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Pid = xt_temp_org_app.Id
+	//		app.Id = 0
+	//		app.Number = 9
+	//		app.Status = 1
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//	}
+	//
+	//	if org_app_15 == nil || org_app_15.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+	//		app, _ := service.GetOrgAppA(0, 15)
+	//		//org, _ := service.GetOrgById(int64(12))
+	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+	//		if org == nil || org.Id == 0 {
+	//			continue
+	//		}
+	//
+	//
+	//		app.OrgId = apps.OrgId
+	//		app.Creator = int(org.Creator)
+	//		app.Pid = xt_temp_org_app.Id
+	//		app.Number = 10
+	//		app.Status = 1
+	//		app.Id = 0
+	//		app.ModifyTime = time.Now().Unix()
+	//		app.CreateTime = time.Now().Unix()
+	//		service.CreateOrgApp(app)
+	//	}
+	//}
 
-	for _, role := range org_role {
-		org_ids = append(org_ids, role.OrgId)
-	}
+	//for _, role := range org_role {
+	//	org_ids = append(org_ids, role.OrgId)
+	//}
 	//
 	//
 	////创建内置角色
-	InitRoleAndPurviews(org_ids)
+	//InitRoleAndPurviews(org_ids)
 
 	//var org_id int = 0
 	////管理员
@@ -442,31 +497,29 @@ func (c *PublicApiController) HandleData() {
 	//	if len(item.RoleIds) == 0{
 	//		ids = strconv.FormatInt( item.RoleId,10)
 	//	}else{
-	//
 	//		ids = item.RoleIds + ","+strconv.FormatInt( item.RoleId,10)
 	//	}
-	//
 	//	service.UpdateRoleIds(item.Id, ids)
 	//}
 	////护士医生
-	//app_roles2  := service.GetAllUserRoleByUserTypeOther(org_id)
-	//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)
-	//}
+	//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",
 	})
@@ -476,7 +529,7 @@ func (c *PublicApiController) HandleData() {
 func InitRoleAndPurviews(org_ids []int64) {
 	roles := LoadRoleConfig("./role.json").Roles
 	for _, org_id := range org_ids {
-		app, _ := service.GetOrgApp(org_id, 3)
+		app, _ := service.GetOrgAppB(org_id, 3)
 		if app == nil || app.Id == 0 {
 			continue
 		}
@@ -494,7 +547,7 @@ func InitRoleAndPurviews(org_ids []int64) {
 				Number:       item.Number,
 				IsSystem:     item.IsSystem,
 			}
-			err := service.CreateOrgRole(role)
+			err := service.CreateOrgRoleB(role)
 			if err == nil {
 				purview := &models.RolePurview{
 					RoleId:     role.Id,
@@ -515,8 +568,8 @@ func InitRoleAndPurviews(org_ids []int64) {
 					Mtime:      time.Now().Unix(),
 				}
 
-				service.CreateRolePurview(purview)
-				service.CreateFuncRolePurview(func_purview)
+				service.CreateRolePurviewB(purview)
+				service.CreateFuncRolePurviewB(func_purview)
 			}
 		}
 

controllers/role.json

@@ -8,7 +8,7 @@
       "is_system": 1,
       "number": 9999,
       "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,94,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,76,156,157,158,159,155,82,83,108,149,154,190,81,101,100,102,161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192,81,82,83,104,106,107,108,149,154,190,191",
-      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20024,20025,20026,20027,20028,20029,20030,20031,20032,20033,20034,20035,20036,20037,20038,20039,20040,20041,20042,20043,20044,20045"
+      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20010,20011,20012,20024,20025,20026,20027,20028,20030,20034,20035,20036,20038,20039,20040,20041,20042,20043,20044,20045,20046,20047,20048,20049,20050,20054"
     },
     {
       "role_name": "医生",
@@ -31,7 +31,6 @@
       "number": 9997,
       "purview_ids": "49,74,75,73,48,52,110,93,121,122,124,125,120",
       "func_ids": "20007,20008,20010,20011,20012,20013,20014,20016,20017,20019,20021,20022,20024,20025,20027,20028"
-
     }
   ]
 }

controllers/verify_login_controller.go

@@ -166,6 +166,10 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 			if len(curAppUrlfors) == 0 {
 				if adminUser.Id == curOrg.Creator { //超级管理员
 					urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(3)
+					//urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(4)
+					//urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(5)
+					//urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(6)
+
 					curAppUrlfors = urlfors
 				} else {
 					appRole, _ := service.FindAdminUserIDA(appRole.Id)
@@ -193,6 +197,9 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 
 							curAppUrlfors = append(curAppUrlfors, "")
 						}
+					} else {
+						curAppUrlfors = append(curAppUrlfors, "")
+
 					}
 				}
 			}

service/app_version.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"XT_New/models"
-	"fmt"
 	"github.com/jinzhu/gorm"
 	"time"
 )
@@ -22,7 +21,7 @@ func GetAppVersionByAppType(apptype int64) (*models.AppVersion, error) {
 
 func GetAllAppOrg() ([]*models.OrgApp, error) {
 	var app []*models.OrgApp
-	err := readUserDb.Model(&models.OrgApp{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
+	err := readUserDbT.Model(&models.OrgApp{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, nil
 	}
@@ -61,7 +60,7 @@ func GetApp() ([]*models.OrgApp, error) {
 
 func GetAppByType(orgID int64, app_type int) (*models.OrgApp, error) {
 	var apps models.OrgApp
-	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	err := readUserDbT.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
 	if err != nil {
 		return nil, err
 	}
@@ -69,7 +68,7 @@ func GetAppByType(orgID int64, app_type int) (*models.OrgApp, error) {
 }
 
 func CreateOrgApp(app *models.OrgApp) {
-	writeUserDb.Create(&app)
+	writeUserDbT.Create(&app)
 
 }
 
@@ -85,46 +84,36 @@ func GetAllUserRole(org_id int64) (appRole []*models.App_Role) {
 }
 
 func GetAllUserRoleByUserTypeOne(org_id int) (appRole []*models.App_Role) {
-	fmt.Println("11111")
-	app, _ := GetOrgApp(int64(org_id), 3)
-	fmt.Println(app)
-
-	if org_id == 0 {
-		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)
-
-	}
+	readUserDbT.Model(&models.App_Role{}).Where("status = 1 AND user_type = 1").Find(&appRole)
 	return
 }
 
-func GetAllUserRoleByUserTypeOther(org_id int) (appRole []*models.App_Role) {
-	app, _ := GetOrgApp(int64(org_id), 3)
-
-	if org_id == 0 {
-		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)
+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)
+	//
+	//} 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)
+	//
+	//}
 	return
 }
 
 func FindRoleByUserTypeOne(org_id int64) (role models.Role) {
-	readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 2 AND role_name = '医生'", org_id).First(&role)
+	readUserDbT.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) {
-	readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 3 AND role_name = '护士'", org_id).First(&role)
+	readUserDbT.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 := readUserDb.Model(&models.Role{}).Where("status = 1").Group("org_id").Find(&app).Error
+	err := readUserDbT.Model(&models.Role{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, nil
 	}
@@ -135,6 +124,52 @@ func GetAllRole() ([]*models.Role, error) {
 }
 
 func UpdateRoleIds(id int64, ids string) {
-	writeUserDb.Model(&models.App_Role{}).Where("status = 1 AND id = ?", id).Updates(map[string]interface{}{"role_ids": ids, "mtime": time.Now().Unix()})
+	writeUserDbT.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
+	if err != nil {
+		return nil, err
+	}
+	return &apps, nil
+}
+
+func GetOrgByIdB(orgID int64) (*models.Org, error) {
+	var org models.Org
+	err := readUserDbT.Model(&models.Org{}).Where("id = ?", orgID).First(&org).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &org, nil
+}
 
+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
+	if err != nil {
+		return nil, err
+	}
+	return &apps, nil
+}
+
+func CreateOrgRoleB(role *models.Role) (err error) {
+	err = writeUserDbT.Create(&role).Error
+	return
+}
+
+func CreateRolePurviewB(purview *models.RolePurview) (err error) {
+	err = writeUserDbT.Create(&purview).Error
+	return
+}
+
+func CreateFuncRolePurviewB(purview *models.SgjUserRoleFuncPurview) (err error) {
+	err = writeUserDbT.Create(&purview).Error
+	return
 }

service/db.go

@@ -37,6 +37,10 @@ var writePatientDb *gorm.DB
 
 var readSgjPatientDb *gorm.DB
 var writeSgjPatientDb *gorm.DB
+
+var readUserDbT *gorm.DB
+var writeUserDbT *gorm.DB
+
 var err error
 
 func ConnectDB() {
@@ -100,6 +104,18 @@ func ConnectDB() {
 	writeSgjPatientPass := beego.AppConfig.String("writesgjpatientmysqlpass")
 	writeSgjPatientName := beego.AppConfig.String("writesgjpatientmysqlname")
 
+	readUserHostT := beego.AppConfig.String("readuserhostTest")
+	readUserPortT := beego.AppConfig.String("readuserportTest")
+	readUserUserT := beego.AppConfig.String("readuseruserTest")
+	readUserPassT := beego.AppConfig.String("readuserpassTest")
+	readUserNameT := beego.AppConfig.String("readusernameTest")
+
+	writeUserHostT := beego.AppConfig.String("writeuserhostTest")
+	writeUserPortT := beego.AppConfig.String("writeuserportTest")
+	writeUserUserT := beego.AppConfig.String("writeuseruserTest")
+	writeUserPassT := beego.AppConfig.String("writeuserpassTest")
+	writeUserNameT := beego.AppConfig.String("writeusernameTest")
+
 	rdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser, readPass, readHost, readPort, readName)
 	wdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUser, writePass, writeHost, writePort, writeName)
 
@@ -115,6 +131,9 @@ func ConnectDB() {
 	rspdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readSgjPatientUser, readSgjPatientPass, readSgjPatientHost, readSgjPatientPort, readSgjPatientName)
 	wspdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeSgjPatientUser, writeSgjPatientPass, writeSgjPatientHost, writeSgjPatientPort, writeSgjPatientName)
 
+	rudsnT := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUserUserT, readUserPassT, readUserHostT, readUserPortT, readUserNameT)
+	wudsnT := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUserUserT, writeUserPassT, writeUserHostT, writeUserPortT, writeUserNameT)
+
 	readDb, err = gorm.Open("mysql", rdsn)
 	if err != nil {
 		//beego.Error(err)
@@ -131,6 +150,22 @@ func ConnectDB() {
 	writeDb.DB().SetMaxOpenConns(100)
 	writeDb.LogMode(true)
 
+	readUserDbT, err = gorm.Open("mysql", rudsnT)
+	if err != nil {
+		//beego.Error(err)
+	}
+	readUserDbT.DB().SetMaxIdleConns(10)
+	readUserDbT.DB().SetMaxOpenConns(100)
+	readUserDbT.LogMode(true)
+
+	writeUserDbT, err = gorm.Open("mysql", wudsnT)
+	if err != nil {
+		//beego.Error(err)
+	}
+	writeUserDbT.DB().SetMaxIdleConns(10)
+	writeUserDbT.DB().SetMaxOpenConns(100)
+	writeUserDbT.LogMode(true)
+
 	readUserDb, err = gorm.Open("mysql", rudsn)
 	if err != nil {
 		//beego.Error(err)

service/role_service.go

@@ -401,7 +401,7 @@ func GetAllGeneralPurviewVMsProcessed(module int) ([]*PurviewTreeViewModel, erro
 
 func GetAllGeneralFuncPurviewVMsProcessed() ([]*PurviewTreeViewModel, error) {
 	var originPurviews []*models.SgjUserOperatePurview
-	getPurviewErr := readUserDb.Model(models.SgjUserOperatePurview{}).Where(" status = 1").Order("id asc").Find(&originPurviews).Error
+	getPurviewErr := readUserDb.Model(models.SgjUserOperatePurview{}).Where(" status = 1").Order("number asc").Find(&originPurviews).Error
 	if getPurviewErr != nil {
 		return nil, getPurviewErr
 	}
@@ -677,7 +677,7 @@ func SaveAdminUser(role *models.App_Role) (err error) {
 }
 
 func GetFunctionPurview() (purview []*models.SgjUserOperatePurview, err error) {
-	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 ").Find(&purview).Error
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 ").Order("number asc").Find(&purview).Error
 	return
 }
 
@@ -710,7 +710,7 @@ func GetUserAllRole(org_id int64, admin_user_id int64) (role models.App_Role, er
 }
 
 func GetAllFunctionPurview() (purview []models.SgjUserOperatePurview, err error) {
-	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 ").Find(&purview).Error
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 ").Order("number asc").Find(&purview).Error
 	return
 }
 
@@ -750,7 +750,7 @@ func FindRoleRecordByRoleName(name string, org_id int64) (total int64) {
 }
 
 func FindAllFuncPurview(ids []string) (purview []*models.SgjUserOperatePurview, err error) {
-	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 AND id in (?)", ids).Find(&purview).Error
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 AND id in (?)", ids).Order("number asc").Find(&purview).Error
 	return
 
 }