Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化数据类型

Browse Source
This commit is contained in:
不做码农
2023-05-15 19:52:54 +08:00
parent caf7d707c3
commit efcb5128c3
13 changed files with 176 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Service/System/SysLoginService.cs
View File

@@ -47,7 +47,7 @@ namespace ZR.Service.System
AddLoginInfo(logininfor);
throw new CustomException(ResultCode.LOGIN_ERROR ,logininfor.Msg);
}
if (user.Status == "1")
if (user.Status == 1)
{
logininfor.Msg = "该用户已禁用";
AddLoginInfo(logininfor);

2
ZR.Service/System/SysMenuService.cs
View File

@@ -205,7 +205,7 @@ namespace ZR.Service
JoinType.Left, rm.Role_id == ur.RoleId,
JoinType.Left, ur.RoleId == r.RoleId
))
.Where((m, rm, ur, r) => m.Status == "0" && r.Status == "0" && ur.UserId == userId)
.Where((m, rm, ur, r) => m.Status == "0" && r.Status == 0 && ur.UserId == userId)
.Select((m, rm, ur, r) => m).ToList();
var menuList = menus.Where(f => !string.IsNullOrEmpty(f.Perms));

10
ZR.Service/System/SysRoleService.cs
View File

@@ -41,9 +41,9 @@ namespace ZR.Service
public PagedInfo<SysRole> SelectRoleList(SysRole sysRole, PagerInfo pager)
{
var exp = Expressionable.Create<SysRole>();
exp.And(role => role.DelFlag == "0");
exp.And(role => role.DelFlag == 0);
exp.AndIF(!string.IsNullOrEmpty(sysRole.RoleName), role => role.RoleName.Contains(sysRole.RoleName));
exp.AndIF(!string.IsNullOrEmpty(sysRole.Status), role => role.Status == sysRole.Status);
exp.AndIF(sysRole.Status != -1, role => role.Status == sysRole.Status);
exp.AndIF(!string.IsNullOrEmpty(sysRole.RoleKey), role => role.RoleKey == sysRole.RoleKey);
var query = Queryable()
@@ -64,7 +64,7 @@ namespace ZR.Service
public List<SysRole> SelectRoleAll()
{
return Queryable()
.Where(role => role.DelFlag == "0")
.Where(role => role.DelFlag == 0)
.OrderBy(role => role.RoleSort)
.ToList();
}
@@ -77,7 +77,7 @@ namespace ZR.Service
public List<SysRole> SelectRolePermissionByUserId(long userId)
{
return Queryable()
.Where(role => role.DelFlag == "0")
.Where(role => role.DelFlag == 0)
.Where(it => SqlFunc.Subqueryable<SysUserRole>().Where(s => s.UserId == userId).Any())
.OrderBy(role => role.RoleSort)
.ToList();
@@ -307,7 +307,7 @@ namespace ZR.Service
/// <returns></returns>
public List<long> SelectUserRoles(long userId)
{
var list = SelectUserRoleListByUserId(userId).Where(f => f.Status == "0");
var list = SelectUserRoleListByUserId(userId).Where(f => f.Status == 0);
return list.Select(x => x.RoleId).ToList();
}

6
ZR.Service/System/SysUserRoleService.cs
View File

@@ -66,7 +66,7 @@ namespace ZR.Service.System
{
return Context.Queryable<SysUserRole, SysUser > ((t1, u) => new JoinQueryInfos(
JoinType.Left, t1.UserId == u.UserId))
.Where((t1, u) => t1.RoleId == roleId && u.DelFlag == "0")
.Where((t1, u) => t1.RoleId == roleId && u.DelFlag == 0)
.Select((t1, u) => u)
.ToList();
}
@@ -80,7 +80,7 @@ namespace ZR.Service.System
{
var query = Context.Queryable<SysUserRole, SysUser>((t1, u) => new JoinQueryInfos(
JoinType.Left, t1.UserId == u.UserId))
.Where((t1, u) => t1.RoleId == roleUserQueryDto.RoleId && u.DelFlag == "0");
.Where((t1, u) => t1.RoleId == roleUserQueryDto.RoleId && u.DelFlag == 0);
if (!string.IsNullOrEmpty(roleUserQueryDto.UserName))
{
query = query.Where((t1, u) => u.UserName.Contains(roleUserQueryDto.UserName));
@@ -96,7 +96,7 @@ namespace ZR.Service.System
public PagedInfo<SysUser> GetExcludedSysUsersByRoleId(RoleUserQueryDto roleUserQueryDto)
{
var query = Context.Queryable<SysUser>()
.Where(it => it.DelFlag == "0")
.Where(it => it.DelFlag == 0)
.Where(it => SqlFunc.Subqueryable<SysUserRole>().Where(s => s.UserId == it.UserId && s.RoleId == roleUserQueryDto.RoleId).NotAny())
.WhereIF(roleUserQueryDto.UserName.IsNotEmpty(), it => it.UserName.Contains(roleUserQueryDto.UserName));

13
ZR.Service/System/SysUserService.cs
View File

@@ -2,6 +2,7 @@ using Infrastructure;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using SqlSugar;
using SqlSugar.IOC;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -43,11 +44,11 @@ namespace ZR.Service
{
var exp = Expressionable.Create<SysUser>();
exp.AndIF(!string.IsNullOrEmpty(user.UserName), u => u.UserName.Contains(user.UserName));
exp.AndIF(!string.IsNullOrEmpty(user.Status), u => u.Status == user.Status);
exp.AndIF(user.Status != -1, u => u.Status == user.Status);
exp.AndIF(user.BeginTime != DateTime.MinValue && user.BeginTime != null, u => u.Create_time >= user.BeginTime);
exp.AndIF(user.EndTime != DateTime.MinValue && user.EndTime != null, u => u.Create_time <= user.EndTime);
exp.AndIF(!user.Phonenumber.IsEmpty(), u => u.Phonenumber == user.Phonenumber);
exp.And(u => u.DelFlag == "0");
exp.And(u => u.DelFlag == 0);
if (user.DeptId != 0)
{
@@ -197,7 +198,7 @@ namespace ZR.Service
UserRoleService.DeleteUserRoleByUserId((int)userid);
// 删除用户与岗位关联
UserPostService.Delete(userid);
return Update(new SysUser() { UserId = userid, DelFlag = "2" }, it => new { it.DelFlag }, f => f.UserId == userid);
return Update(new SysUser() { UserId = userid, DelFlag = 2 }, it => new { it.DelFlag }, f => f.UserId == userid);
}
/// <summary>
@@ -229,7 +230,7 @@ namespace ZR.Service
UserName = dto.Username,
NickName = dto.Username,
Password = password,
Status = "0",
Status = 0,
DeptId = 0,
Remark = "用户注册"
};
@@ -275,8 +276,8 @@ namespace ZR.Service
users.ForEach(x =>
{
x.Create_time = DateTime.Now;
x.Status = "0";
x.DelFlag = "0";
x.Status = 0;
x.DelFlag = 0;
x.Password = "E10ADC3949BA59ABBE56E057F20F883E";
x.Remark = x.Remark.IsEmpty() ? "数据导入" : x.Remark;
});