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

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -54,11 +54,18 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 	this.MobileBaseAPIController.Prepare()
 	adminUserInfo := this.GetMobileAdminUserInfo()
 
-	if adminUserInfo == nil || len(token) == 0 {
+	if adminUserInfo == nil {
+		this.DelSession("mobile_admin_user_info")
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		this.StopRun()
 	}
 
+	if len(token) == 0 {
+		this.DelSession("mobile_admin_user_info")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLoginTimeout)
+		this.StopRun()
+	}
+
 	//if this.Ctx.Request.Method != "GET" {
 	//	err := service.GetOrgSubscibeState(adminUserInfo.Subscibe)
 	//	if err != nil || adminUserInfo.Subscibe.State == 3 {

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -623,67 +623,84 @@ func (this *HomeController) GetFuncPermission() {
 	var is_has_check bool
 	var is_has_modify_exce bool
 
-	if app_role != nil {
-		if len(app_role.RoleIds) > 0 {
-			roles := strings.Split(app_role.RoleIds, ",")
-			var userRolePurviews string
-			for _, item := range roles {
-				role_id, _ := strconv.ParseInt(item, 10, 64)
-				purviews, _ := service.GetRoleFuncPurviewIds(role_id)
-				if len(userRolePurviews) == 0 {
-					userRolePurviews = purviews
-				} else {
-					userRolePurviews = userRolePurviews + "," + purviews
-				}
-			}
-			userRolePurviewsArr := RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
-			funcPurviews, _ := service.FindAllFuncPurview(userRolePurviewsArr)
-			for _, item := range funcPurviews {
-				//for _, url := range strings.Split(item.Urlfor,","){
-				if strings.Split(item.Urlfor, ",")[0] == create_url {
-					is_has_create = true
-				}
-				if strings.Split(item.Urlfor, ",")[0] == modify_url {
-					is_has_modify = true
-				}
-				if strings.Split(item.Urlfor, ",")[0] == modify_other_url {
-					is_has_modify_other = true
-				}
-				if strings.Split(item.Urlfor, ",")[0] == del_url {
-					is_has_del = true
-				}
-				if strings.Split(item.Urlfor, ",")[0] == del_other_url {
-					is_has_del_other = true
-				}
-				if strings.Split(item.Urlfor, ",")[0] == exce_url {
-					is_has_exce = true
-				}
-				if strings.Split(item.Urlfor, ",")[0] == check_url {
-					is_has_check = true
-				}
-				if strings.Split(item.Urlfor, ",")[0] == modify_exce_url {
-					is_has_modify_exce = true
+	if adminUserInfo.AdminUser.Id != adminUserInfo.Org.Creator {
+
+		if app_role != nil {
+			if len(app_role.RoleIds) > 0 {
+				roles := strings.Split(app_role.RoleIds, ",")
+				var userRolePurviews string
+				for _, item := range roles {
+					role_id, _ := strconv.ParseInt(item, 10, 64)
+					purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+					if len(userRolePurviews) == 0 {
+						userRolePurviews = purviews
+					} else {
+						userRolePurviews = userRolePurviews + "," + purviews
+					}
 				}
+				userRolePurviewsArr := RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+				funcPurviews, _ := service.FindAllFuncPurview(userRolePurviewsArr)
+				for _, item := range funcPurviews {
+					//for _, url := range strings.Split(item.Urlfor,","){
+					if strings.Split(item.Urlfor, ",")[0] == create_url {
+						is_has_create = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_url {
+						is_has_modify = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_other_url {
+						is_has_modify_other = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == del_url {
+						is_has_del = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == del_other_url {
+						is_has_del_other = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == exce_url {
+						is_has_exce = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == check_url {
+						is_has_check = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_exce_url {
+						is_has_modify_exce = true
+					}
 
+				}
+			} else {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRole)
+				return
 			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"is_has_create":       is_has_create,
+				"is_has_modify":       is_has_modify,
+				"is_has_modify_other": is_has_modify_other,
+				"is_has_del":          is_has_del,
+				"is_has_del_other":    is_has_del_other,
+				"is_has_exce":         is_has_exce,
+				"is_has_check":        is_has_check,
+				"is_has_modify_exce":  is_has_modify_exce,
+				"module":              module,
+			})
 		} else {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRole)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserIsExit)
 			return
+
 		}
+
+	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"is_has_create":       is_has_create,
-			"is_has_modify":       is_has_modify,
-			"is_has_modify_other": is_has_modify_other,
-			"is_has_del":          is_has_del,
-			"is_has_del_other":    is_has_del_other,
-			"is_has_exce":         is_has_exce,
-			"is_has_check":        is_has_check,
-			"is_has_modify_exce":  is_has_modify_exce,
-			"module":              module,
+			"is_has_create":       true,
+			"is_has_modify":       true,
+			"is_has_modify_other": true,
+			"is_has_del":          true,
+			"is_has_del_other":    true,
+			"is_has_exce":         true,
+			"is_has_check":        true,
+			"is_has_modify_exce":  true,
+			"module":              true,
 		})
-	} else {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserIsExit)
-		return
 
 	}