Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss into dev

@@ -6,6 +6,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
 
 
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 )
@@ -29,13 +30,13 @@ func (l *SystemDeleteLogic) SystemDelete(req *types.DepartmentGetRequest) (resp
 
 
 	one, err := l.svcCtx.DepartmentRepository.FindOne(l.ctx, conn, req.Id)
 	one, err := l.svcCtx.DepartmentRepository.FindOne(l.ctx, conn, req.Id)
 	if err != nil {
 	if err != nil {
-		return nil, err
+		return nil, xerr.NewErrMsg("数据不存在")
 	}
 	}
 
 
 	// 获取公司下的所有用户
 	// 获取公司下的所有用户
 	_, users, err := l.svcCtx.UserRepository.Find(l.ctx, conn, domain.NewQueryOptions().
 	_, users, err := l.svcCtx.UserRepository.Find(l.ctx, conn, domain.NewQueryOptions().
 		WithFindOnly().
 		WithFindOnly().
-		WithKV(" companyId", one.CompanyId))
+		WithKV("companyId", one.CompanyId))
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}

@@ -4,6 +4,7 @@ import (
 	"context"
 	"context"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
 
 
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 )
@@ -26,7 +27,7 @@ func (l *SystemGetLogic) SystemGet(req *types.DepartmentGetRequest) (resp *types
 	var conn = l.svcCtx.DefaultDBConn()
 	var conn = l.svcCtx.DefaultDBConn()
 	department, err := l.svcCtx.DepartmentRepository.FindOne(l.ctx, conn, req.Id)
 	department, err := l.svcCtx.DepartmentRepository.FindOne(l.ctx, conn, req.Id)
 	if err != nil {
 	if err != nil {
-		return nil, err
+		return nil, xerr.NewErrMsg("数据不存在")
 	}
 	}
 	resp = &types.DepartmentGetResponse{
 	resp = &types.DepartmentGetResponse{
 		Department: types.Department{
 		Department: types.Department{

@@ -58,7 +58,7 @@ func (l *SystemUpdateLogic) SystemUpdate(req *types.DepartmentUpdateRequest) (re
 	// 获取公司下的所有用户
 	// 获取公司下的所有用户
 	_, users, err := l.svcCtx.UserRepository.Find(l.ctx, conn, domain.NewQueryOptions().
 	_, users, err := l.svcCtx.UserRepository.Find(l.ctx, conn, domain.NewQueryOptions().
 		WithFindOnly().
 		WithFindOnly().
-		WithKV(" companyId", one.CompanyId))
+		WithKV("companyId", one.CompanyId))
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
@@ -83,7 +83,7 @@ func (l *SystemUpdateLogic) SystemUpdate(req *types.DepartmentUpdateRequest) (re
 			if _, ok := newIdMap[user.Id]; ok {
 			if _, ok := newIdMap[user.Id]; ok {
 				var targetIndex = findIndex(user.Departments, req.Id)
 				var targetIndex = findIndex(user.Departments, req.Id)
 				if targetIndex == -1 { // 归属分组不存在，则新增
 				if targetIndex == -1 { // 归属分组不存在，则新增
-					user.Departments = append(user.Departments)
+					user.Departments = append(user.Departments, req.Id)
 					_, err = l.svcCtx.UserRepository.UpdateWithVersion(l.ctx, conn, user)
 					_, err = l.svcCtx.UserRepository.UpdateWithVersion(l.ctx, conn, user)
 					if err != nil {
 					if err != nil {
 						return err
 						return err