修复登录 app 优先级选择的 bug

controllers/verify_token_controller.go

@@ -416,14 +416,6 @@ func (this *VerifyTokenController) _createAppIfNeeded(adminUserID int, orgID int
 
 	// 自动创建所有应用
 	didCreateNew := false
-	if did_patient_manage_create == false {
-		err := service.CreateOrgApp(adminUserID, orgID, 1, false)
-		if err != nil {
-			utils.ErrorLog("自动创建酷医聚客应用失败:%v", err)
-			return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
-		}
-		didCreateNew = true
-	}
 	if did_dialysis_manage_create == false {
 		err := service.CreateOrgApp(adminUserID, orgID, 3, false)
 		if err != nil {
@@ -440,6 +432,14 @@ func (this *VerifyTokenController) _createAppIfNeeded(adminUserID int, orgID int
 		}
 		didCreateNew = true
 	}
+	if did_patient_manage_create == false {
+		err := service.CreateOrgApp(adminUserID, orgID, 1, false)
+		if err != nil {
+			utils.ErrorLog("自动创建酷医聚客应用失败:%v", err)
+			return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
+		}
+		didCreateNew = true
+	}
 	if did_mall_manage_create == false {
 		err := service.CreateOrgApp(adminUserID, orgID, 5, false)
 		if err != nil {

service/login_service.go

@@ -73,7 +73,7 @@ func GetAdminUserLastLoginLog(adminUserID int, appType int) (*models.AdminUserLo
 }
 
 func GetAdminUserPrioritizedAppType(adminUserID int) (int8, error) {
-	rows, err := readUserDb.Raw("SELECT app.app_type FROM sgj_user_org_app AS app, sgj_user_admin_role AS r WHERE r.admin_user_id = ? AND r.app_id = app.id AND app.status = 1 AND r.status = 1 ORDER BY app.org_id ASC, app.app_type ASC LIMIT 1;", adminUserID).Rows()
+	rows, err := readUserDb.Raw("SELECT app.app_type FROM sgj_user_org_app AS app, sgj_user_admin_role AS r WHERE r.admin_user_id = ? AND r.app_id = app.id AND app.status = 1 AND app.open_status = 1 AND r.status = 1 ORDER BY app.org_id ASC, app.app_type ASC LIMIT 1;", adminUserID).Rows()
 	defer rows.Close()
 	if err != nil {
 		return 0, err

service/org_service.go

@@ -30,15 +30,16 @@ func CreateOrg(org *models.Org, mobile string, openXT bool, openCDM bool, openSC
 		return err
 	}
 
-	if err := createOrgApp(tx_admin, &role, mobile, 1, openSCRM); err != nil {
+	// app 的创建顺序也决定了登录后前往 app 的优先级
+	if err := createOrgApp(tx_admin, &role, mobile, 3, openXT); err != nil {
 		tx_admin.Rollback()
 		return err
 	}
-	if err := createOrgApp(tx_admin, &role, mobile, 3, openXT); err != nil {
+	if err := createOrgApp(tx_admin, &role, mobile, 4, openCDM); err != nil {
 		tx_admin.Rollback()
 		return err
 	}
-	if err := createOrgApp(tx_admin, &role, mobile, 4, openCDM); err != nil {
+	if err := createOrgApp(tx_admin, &role, mobile, 1, openSCRM); err != nil {
 		tx_admin.Rollback()
 		return err
 	}