kenneth/projectx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
kenneth
2025-10-27 15:24:08 +08:00
parent 4186cd0caf
commit df4c3dd46f
47 changed files with 1757 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/erpserver/service/v1/auth/auth.go
View File

@@ -167,7 +167,7 @@ func (a *Auth) validateUser(ctx context.Context, email, password string) (*syste
user.Role, err = a.roleService.Get(ctx, user.RoleID)
if err != nil {
return nil, err
return nil, errors.New("账号没有配置角色, 请联系管理员")
}
if user.Role == nil || user.Role.ID == 0 {

8
internal/erpserver/service/v1/system/department.go
View File

@@ -12,10 +12,10 @@ import (
"management/internal/erpserver/model/system"
"management/internal/erpserver/model/view"
"management/internal/erpserver/service/util"
"management/internal/erpserver/service/v1"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/convertor"
"management/internal/pkg/database"
"management/internal/pkg/know"
"management/internal/pkg/sqldb"
)
type departmentService struct {
@@ -58,9 +58,9 @@ func (s *departmentService) Create(ctx context.Context, req *form.Department) er
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err := s.repo.Create(ctx, arg)
_, err := s.repo.Create(ctx, arg)
if err != nil {
if database.IsUniqueViolation(err) {
if errors.Is(err, sqldb.ErrDBDuplicatedEntry) {
return errors.New("部门已存在")
}
return err

8
internal/erpserver/service/v1/system/role.go
View File

@@ -12,10 +12,10 @@ import (
"management/internal/erpserver/model/system"
"management/internal/erpserver/model/view"
"management/internal/erpserver/service/util"
"management/internal/erpserver/service/v1"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/convertor"
"management/internal/pkg/database"
"management/internal/pkg/know"
"management/internal/pkg/sqldb"
)
type roleService struct {
@@ -60,9 +60,9 @@ func (s *roleService) Create(ctx context.Context, req *form.Role) error {
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err := s.repo.Create(ctx, arg)
_, err := s.repo.Create(ctx, arg)
if err != nil {
if database.IsUniqueViolation(err) {
if errors.Is(err, sqldb.ErrDBDuplicatedEntry) {
return errors.New("角色名称已存在")
}
return err

12
internal/erpserver/service/v1/system/user.go
View File

@@ -10,11 +10,11 @@ import (
"management/internal/erpserver/model/form"
"management/internal/erpserver/model/system"
"management/internal/erpserver/model/view"
"management/internal/erpserver/service/v1"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/crypto"
"management/internal/pkg/database"
"management/internal/pkg/know"
"management/internal/pkg/rand"
"management/internal/pkg/sqldb"
"github.com/google/uuid"
"go.uber.org/zap"
@@ -75,9 +75,9 @@ func (s *userService) Create(ctx context.Context, req *form.User) error {
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = s.repo.Create(ctx, user)
_, err = s.repo.Create(ctx, user)
if err != nil {
if database.IsUniqueViolation(err) {
if errors.Is(err, sqldb.ErrDBDuplicatedEntry) {
return errors.New("用户已经存在")
}
return err
@@ -106,7 +106,9 @@ func (s *userService) Update(ctx context.Context, req *form.User) error {
user.HashedPassword = hashedPassword
user.ChangePasswordAt = time.Now()
}
return s.repo.Update(ctx, user)
_, err = s.repo.Update(ctx, user)
return err
}
func (s *userService) All(ctx context.Context) ([]*system.User, error) {