优化销售移动分组

controllers/sys_admin.go

@@ -1177,27 +1177,26 @@ func (this *SysAdminController) Move() {
 
 	// 修改客户关联的分组
 	{
+		// 有小组时GroupId取小组ID
 		if req.TeamId > 0 {
-			if req.TeamId != adminInfo.GroupId {
-				err = company.ModifyCompanyGroupId(req.AdminId, req.TeamId)
-				if err != nil {
-					br.Msg = "编辑失败"
-					br.ErrMsg = "ModifyCompanyGroupId，Err:" + err.Error()
-					return
-				}
+			err = company.ModifyCompanyGroupId(req.AdminId, req.TeamId)
+			if err != nil {
+				br.Msg = "编辑失败"
+				br.ErrMsg = "ModifyCompanyGroupId，Err:" + err.Error()
+				return
 			}
-		} else {
-			if req.GroupId != adminInfo.GroupId {
-				err = company.ModifyCompanyGroupId(req.AdminId, req.GroupId)
-				if err != nil {
-					br.Msg = "编辑失败"
-					br.ErrMsg = "ModifyCompanyGroupId，Err:" + err.Error()
-					return
-				}
+		}
+		// 无TeamId时GroupId取大组ID
+		if req.TeamId <= 0 && req.GroupId > 0 {
+			err = company.ModifyCompanyGroupId(req.AdminId, req.GroupId)
+			if err != nil {
+				br.Msg = "编辑失败"
+				br.ErrMsg = "ModifyCompanyGroupId，Err:" + err.Error()
+				return
 			}
 		}
 
-		if req.DepartmentId != adminInfo.DepartmentId {
+		if req.DepartmentId > 0 {
 			err = company.ModifyCompanyDepartmentId(req.AdminId, req.DepartmentId)
 			if err != nil {
 				br.Msg = "编辑失败"