williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目信息

Browse Source
This commit is contained in:
henry
2022-01-07 16:12:43 +08:00
parent 657fdc5750
commit 2bf3c01702
21 changed files with 379 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/api/admin/controller/user/instance.go
View File

@ -26,12 +26,15 @@ type (
InstanceInfo struct {
ID string `json:"id"`
InstanceUserInfo
Account string `json:"account"`
Gender model2.GenderKind `json:"gender"`
IsAdmin model2.SysUserAdministrator `json:"is_admin"`
Status model2.SysUserStatus `json:"status"`
Department *InstanceDepartmentInfo `json:"department"`
Role *InstanceRoleInfo `json:"role"`
CreatedAt time.Time `json:"created_at"`
//Role *InstanceRoleInfo `json:"role"`
RoleIDs []string `json:"role_ids"`
Remark string `json:"remark"`
CreatedAt time.Time `json:"created_at"`
}
// InstanceUserInfo 用户信息
InstanceUserInfo struct {
@ -55,11 +58,11 @@ type (
// InstanceForm 表单信息
type InstanceForm struct {
ID uint64
Account, Name, Mobile, Password, Remark string
Gender int
DepartmentID uint64
RoleIDs []uint64
ID uint64
Account, Name, Mobile, Password, Email, Remark string
Gender, Status int
DepartmentID uint64
RoleIDs []uint64
}
func (c *InstanceForm) sync(tx *gorm.DB, first bool, uid, tenantID uint64) error {
@ -171,7 +174,10 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
InstanceUserInfo: InstanceUserInfo{
UID: v.UUIDString(), Avatar: v.Avatar, Name: v.Name, Email: v.Email, Mobile: v.Mobile,
},
Gender: v.Gender.Gender, IsAdmin: v.IsAdmin, Status: v.Status, CreatedAt: v.CreatedAt,
Account: v.Account, Gender: v.Gender.Gender, IsAdmin: v.IsAdmin, Status: v.Status, CreatedAt: v.CreatedAt,
//Role: make([]*InstanceRoleInfo, 0),
RoleIDs: make([]string, 0),
Remark: v.Remark,
}
if v.DepartmentID > 0 {
@ -188,11 +194,11 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
obj.ID = utils.StringToUnit64(v)
roleIDs = append(roleIDs, obj.GetEncodeID())
}
roles := &InstanceRoleInfo{
IDs: roleIDs,
Names: strings.Split(v.RoleNames, "&&"),
}
data.Role = roles
//roles := &InstanceRoleInfo{
// IDs: roleIDs,
//Names: strings.Split(v.RoleNames, "&&"),
//}
data.RoleIDs = roleIDs
}
list = append(list, data)
}
@ -201,7 +207,7 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
// Add 添加用户
func (c *Instance) Add(params *InstanceForm) error {
if utils.ValidateMobile(params.Mobile) {
if !utils.ValidateMobile(params.Mobile) {
return errors.New("操作错误，手机号码格式错误")
}
mSysUser := model.NewSysUser()
@ -213,15 +219,18 @@ func (c *Instance) Add(params *InstanceForm) error {
if err != nil {
return err
} else if count > 0 {
return errors.New("操作错误，当前手机号码已注册")
}
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
mSysUser.TenantID = c.TenantID
mSysUser.Account = params.Account
mSysUser.Name = params.Name
mSysUser.Mobile = params.Mobile
mSysUser.Email = params.Email
mSysUser.Gender.Gender = model2.GenderKind(params.Gender)
mSysUser.Password = params.Password
mSysUser.Status = model2.SysUserStatus(params.Status)
mSysUser.Remark = params.Remark
if err = model2.Create(mSysUser.SysUser, tx); err != nil {
@ -250,7 +259,7 @@ func (c *Instance) Edit(params *InstanceForm) error {
return errors.New("操作错误，无权限操作")
}
if mSysUser.Mobile != params.Mobile {
if utils.ValidateMobile(params.Mobile) {
if !utils.ValidateMobile(params.Mobile) {
return errors.New("操作错误，手机号码格式错误")
}
var count int64
@ -263,8 +272,8 @@ func (c *Instance) Edit(params *InstanceForm) error {
}
mSysUser.Mobile = params.Mobile
}
mSysUser.Account = params.Account
mSysUser.Name = params.Name
mSysUser.Email = params.Email
mSysUser.Gender.Gender = model2.GenderKind(params.Gender)
mSysUser.Remark = params.Remark
@ -280,10 +289,11 @@ func (c *Instance) Edit(params *InstanceForm) error {
}
func (c *Instance) Password(id uint64, password, repeatPwd string) error {
if password != repeatPwd {
return errors.New("操作错误，两次密码输入不一致")
}
//if password != repeatPwd {
// return errors.New("操作错误，两次密码输入不一致")
//}
mSysUser := model.NewSysUser()
mSysUser.ID = id
isExist, err := model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "is_admin"})