Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsBaseWeb/Business/BaseStudent/BaseStudentController/BaseStudentController.go

@@ -570,9 +570,11 @@ func ImportStudentExcel(c *gin.Context) {
 	} else if r.Message == "02" {
 		errorCode = r.Message
 		message = c.Request.Host + "/base/student/DownLoadErrorExcel?fileId=" + fileId + "&fileName=" + url.QueryEscape(strings.Split(header.Filename, ".xlsx")[0])
-	} else {
+	} else if r.Message == "03" {
 		errorCode = "03"
 		message = "上传文件未找到！"
+	} else {
+		message = r.Message
 	}
 
 	c.JSON(http.StatusOK, Model.Res{

dsBaseWeb/Business/BaseTeacher/BaseTeacherController/BaseTeacherController.go

@@ -589,9 +589,11 @@ func ImportTeacherExcel(c *gin.Context) {
 	} else if r.Message == "02" {
 		errorCode = r.Message
 		message = c.Request.Host + "/base/teacher/DownLoadErrorExcel?fileId=" + fileId + "&fileName=" + url.QueryEscape(strings.Split(header.Filename, ".xlsx")[0])
-	} else {
+	} else if r.Message == "03" {
 		errorCode = "03"
 		message = "上传文件未找到！"
+	} else {
+		message = r.Message
 	}
 
 	c.JSON(http.StatusOK, Model.Res{

dsBaseWeb/Handler/CheckHandler/LimitRoleId.go

@@ -141,6 +141,12 @@ func roleIdLimitIsLegal(c *gin.Context, interName string, n int) (bool, ResultSt
 	if !Reply.Success {
 		resultStruct.HttpType = httpType
 		resultStruct.Message = Reply.Message
+
+		//清cookie
+		c.SetCookie("person_id", "", -1, "/", "", false, true)
+		c.SetCookie("identity_id", "", -1, "/", "", false, true)
+		c.SetCookie("token", "", -1, "/", "", false, true)
+
 		return false, resultStruct
 	}
 	return true, resultStruct