Merge pull request #49 from NJUPT-SAST/dev-windpo

fix:org_id bug when initProfile
NJUPT-SAST · Oct 12, 2023 · 073c4cd · 073c4cd
2 parents f7d0b8f + 3e6c8d6
commit 073c4cd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/api/v1/profile.go b/api/v1/profile.go
@@ -35,7 +35,6 @@ func GetProfile(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, result.Failed(result.HandleError(serErr)))
 		return
 	}
-
 	if dep, org, getOrgErr := service.GetProfileOrg(profileInfo.OrgId); getOrgErr != nil {
 		controllerLogger.Errorln("GetProfileOrg Err", getOrgErr)
 		ctx.JSON(http.StatusOK, result.Failed(result.HandleError(getOrgErr)))

diff --git a/service/profile.go b/service/profile.go
@@ -14,7 +14,7 @@ var cos = util.T_cos
 
 func ChangeProfile(profile *model.Profile, uid string) error {
 	// check org_id
-	if profile.OrgId > 26 {
+	if profile.OrgId > 26 || profile.OrgId < 1 {
 		serviceLogger.Infof("org_id input Err")
 		return result.OrgIdError
 	}
@@ -80,14 +80,16 @@ func GetProfileOrg(OrgId int) (string, string, error) {
 	if OrgId > 26 {
 		serviceLogger.Errorln("org_id input Err")
 		return "", "", result.OrgIdError
-	}
-
-	//get dep and org
-	if dep, org, err := model.GetDepAndOrgByOrgId(OrgId); err != nil {
-		serviceLogger.Errorln("GetDepAndOrgByOrgId Err", err)
-		return "", "", err
+	} else if OrgId == 0 {
+		return "", "", nil
 	} else {
-		return dep, org, nil
+		//get dep and org
+		if dep, org, err := model.GetDepAndOrgByOrgId(OrgId); err != nil {
+			serviceLogger.Errorln("GetDepAndOrgByOrgId Err", err)
+			return "", "", err
+		} else {
+			return dep, org, nil
+		}
 	}
 }