bug 修复

@@ -516,6 +516,10 @@ func (c RankController) RankRangeMove() {
 		return
 		return
 	}
 	}
 	companyid := c.GetCompanyId()
 	companyid := c.GetCompanyId()
+	if len(param.RelationId) == 0 {
+		msg = protocol.BadRequestParam("10126")
+		return
+	}
 	err := serverank.RankRangeMove(param.FromId, param.ToId, param.RelationId, companyid)
 	err := serverank.RankRangeMove(param.FromId, param.ToId, param.RelationId, companyid)
 	msg = protocol.NewReturnResponse(nil, err)
 	msg = protocol.NewReturnResponse(nil, err)
 	return
 	return

@@ -123,6 +123,7 @@ var errmessge ErrorMap = map[string]string{
 	"10123": "排行榜评比项最多4项",
 	"10123": "排行榜评比项最多4项",
 	"10124": "公司未启用该模块",
 	"10124": "公司未启用该模块",
 	"10125": "参与范围名称不能重复",
 	"10125": "参与范围名称不能重复",
+	"10126": "被转移人员不能为空",
 }
 }
 
 
 //错误码转换 ，兼容需要
 //错误码转换 ，兼容需要

@@ -56,12 +56,12 @@ type ModuleEmployee struct {
 }
 }
 
 
 type DeleteUserData struct {
 type DeleteUserData struct {
-	CompanyId int64   `json:"company_id"`
+	CompanyId int64   `json:"companyId"`
 	Ids       []int64 `json:"ids"`
 	Ids       []int64 `json:"ids"`
 }
 }
 
 
 type ForbidAllowUserData struct {
 type ForbidAllowUserData struct {
-	CompanyId int64   `json:"company_id"`
+	CompanyId int64   `json:"companyId"`
 	Ids       []int64 `json:"ids"`
 	Ids       []int64 `json:"ids"`
 	Status    int8    `json:"status"`
 	Status    int8    `json:"status"`
 }
 }
@@ -435,7 +435,9 @@ func editUserDepart(usercompanyid int64, companyid int64, userDepart []UserDepar
 	}
 	}
 	if len(delDepartIds) > 0 {
 	if len(delDepartIds) > 0 {
 		_, err = o.QueryTable(&models.UserDepartment{}).
 		_, err = o.QueryTable(&models.UserDepartment{}).
-			Filter("id__in", delDepartIds).
+			Filter("department_id__in", delDepartIds).
+			Filter("user_company_id", usercompanyid).
+			Filter("enable_status", 1).
 			Update(orm.Params{
 			Update(orm.Params{
 				"enable_status": models.USER_DEPARTMENT_ENABLE_NO,
 				"enable_status": models.USER_DEPARTMENT_ENABLE_NO,
 			})
 			})
@@ -488,7 +490,9 @@ func editUserPosition(usercompanyid int64, companyid int64, userPosition []UserP
 	}
 	}
 	if len(delPositionIds) > 0 {
 	if len(delPositionIds) > 0 {
 		_, err = o.QueryTable(&models.UserPosition{}).
 		_, err = o.QueryTable(&models.UserPosition{}).
-			Filter("id__in", delPositionIds).
+			Filter("position_id__in", delPositionIds).
+			Filter("user_company_id", usercompanyid).
+			Filter("enable_status", 1).
 			Update(orm.Params{
 			Update(orm.Params{
 				"enable_status": models.USER_POSITION_ENABLE_NO,
 				"enable_status": models.USER_POSITION_ENABLE_NO,
 			})
 			})