public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-29 10:41:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

iot init

Browse Source
This commit is contained in:
XM-GO
2023-08-22 17:29:11 +08:00
parent 5be575e982
commit 3ac5ecc55a
20 changed files with 88 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/system/services/dept.go
View File

@@ -63,9 +63,6 @@ func (m *sysDeptModelImpl) FindListPage(page, pageSize int, data entity.SysDept)
if data.DeptName != "" {
db = db.Where("dept_name like ?", "%"+data.DeptName+"%")
}
if data.TenantId != 0 {
db = db.Where("tenant_id = ?", data.TenantId)
}
if data.Status != "" {
db = db.Where("status = ?", data.Status)
}
@@ -87,9 +84,6 @@ func (m *sysDeptModelImpl) FindList(data entity.SysDept) *[]entity.SysDept {
if data.DeptId != 0 {
db = db.Where("dept_id = ?", data.DeptId)
}
if data.TenantId != 0 {
db = db.Where("tenant_id = ?", data.TenantId)
}
if data.DeptName != "" {
db = db.Where("dept_name like ?", "%"+data.DeptName+"%")
}

6
apps/system/services/post.go
View File

@@ -50,9 +50,6 @@ func (m *sysPostModelImpl) FindListPage(page, pageSize int, data entity.SysPost)
if data.PostName != "" {
db = db.Where("post_name like ?", "%"+data.PostName+"%")
}
if data.TenantId != 0 {
db = db.Where("tenant_id = ?", data.TenantId)
}
if data.PostCode != "" {
db = db.Where("post_code like ?", "%"+data.PostCode+"%")
}
@@ -76,9 +73,6 @@ func (m *sysPostModelImpl) FindList(data entity.SysPost) *[]entity.SysPost {
if data.PostName != "" {
db = db.Where("post_name = ?", data.PostName)
}
if data.TenantId != 0 {
db = db.Where("tenant_id = ?", data.TenantId)
}
if data.PostCode != "" {
db = db.Where("post_code = ?", data.PostCode)
}

19
apps/system/services/user.go
View File

@@ -6,7 +6,6 @@ import (
"golang.org/x/crypto/bcrypt"
"pandax/apps/system/entity"
"pandax/pkg/global"
"time"
)
type (
@@ -40,11 +39,6 @@ func (m *sysUserModelImpl) Login(u entity.Login) *entity.SysUser {
b := kgo.KEncr.PasswordVerify([]byte(u.Password), []byte(user.Password))
biz.IsTrue(b, "密码错误")
//验证租户
if SysTenantModelDao.FindOne(user.TenantId).ExpireTime.Unix() < time.Now().Unix() {
biz.IsTrue(b, "租户已经过期")
}
return user
}
@@ -69,9 +63,6 @@ func (m *sysUserModelImpl) FindOne(data entity.SysUser) *entity.SysUserView {
if data.UserId != 0 {
db = db.Where("user_id = ?", data.UserId)
}
if data.TenantId != 0 {
db = db.Where("tenant_id = ?", data.TenantId)
}
if data.Username != "" {
db = db.Where("username = ?", data.Username)
}
@@ -87,7 +78,7 @@ func (m *sysUserModelImpl) FindOne(data entity.SysUser) *entity.SysUserView {
if data.PostId != 0 {
db = db.Where("post_id = ?", data.PostId)
}
biz.ErrIsNil(db.Preload("SysTenants").First(resData).Error, "查询用户失败")
biz.ErrIsNil(db.First(resData).Error, "查询用户失败")
return resData
}
@@ -102,9 +93,6 @@ func (m *sysUserModelImpl) FindListPage(page, pageSize int, data entity.SysUser)
if data.Username != "" {
db = db.Where("sys_users.username = ?", data.Username)
}
if data.TenantId != 0 {
db = db.Where("sys_users.tenant_id = ?", data.TenantId)
}
if data.NickName != "" {
db = db.Where("sys_users.nick_name like ?", "%"+data.NickName+"%")
}
@@ -121,7 +109,7 @@ func (m *sysUserModelImpl) FindListPage(page, pageSize int, data entity.SysUser)
}
db.Where("sys_users.delete_time IS NULL")
err := db.Count(&total).Error
err = db.Limit(pageSize).Offset(offset).Preload("SysTenants").Find(&list).Error
err = db.Limit(pageSize).Offset(offset).Find(&list).Error
biz.ErrIsNil(err, "查询用户分页列表失败")
return &list, total
}
@@ -134,9 +122,6 @@ func (m *sysUserModelImpl) FindList(data entity.SysUser) *[]entity.SysUserView {
if data.UserId != 0 {
db = db.Where("user_id = ?", data.UserId)
}
if data.TenantId != 0 {
db = db.Where("tenant_id = ?", data.TenantId)
}
if data.Username != "" {
db = db.Where("username = ?", data.Username)
}