|
|
@@ -1,5 +1,7 @@
|
|
|
|
|
|
using AutoMapper;
|
|
|
+using EyeSoft.Collections.Generic;
|
|
|
+using EyeSoft.Runtime.InteropServices;
|
|
|
using NPOI.SS.Formula.Functions;
|
|
|
using OASystem.Domain;
|
|
|
using OASystem.Domain.Dtos.Groups;
|
|
|
@@ -38,19 +40,110 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
/// <returns></returns>
|
|
|
public async Task<List<PermissionViewUserview>> PermissionViewUsersAsync()
|
|
|
{
|
|
|
- var gj_jobPostIds = new List<int>() { 22, 32 };
|
|
|
+ //添加市场部人员
|
|
|
var viewPermissionData = await _sqlSugar.Queryable<Sys_Users>()
|
|
|
- .Where(x => x.IsDel == 0 && ((x.DepId == 7 && gj_jobPostIds.Contains(x.JobPostId)) || x.DepId == 6))
|
|
|
- .Select(x => new PermissionViewUserview { Id = x.Id, Name = x.CnName })
|
|
|
+ .LeftJoin<Sys_Department>((u, d) => u.DepId == d.Id)
|
|
|
+ .Where((u, d) => u.IsDel == 0 && u.HrAudit == 1 && d.DepName.Equals("市场部"))
|
|
|
+ .Select((u, d) => new PermissionViewUserview { Id = u.Id, Name = u.CnName })
|
|
|
.ToListAsync();
|
|
|
|
|
|
+ //去掉特殊人员
|
|
|
+ if (viewPermissionData.Any())
|
|
|
+ {
|
|
|
+ var notName = new string[] { "高媛媛", "管理员" };
|
|
|
+ viewPermissionData = viewPermissionData.Where(x => !notName.Any(x1 => x.Name.Contains(x1))).ToList();
|
|
|
+ }
|
|
|
+
|
|
|
+ //添加特定人员
|
|
|
+ var feeBasePerm = AppSettingsHelper.Get<FeeBasePermView>("FeeBasePerm");
|
|
|
+ if (feeBasePerm.Any())
|
|
|
+ {
|
|
|
+ foreach (var item in feeBasePerm)
|
|
|
+ {
|
|
|
+ if (item.Users.Any())
|
|
|
+ {
|
|
|
+ viewPermissionData.AddRange(item.Users);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return viewPermissionData.GroupBy(x => x.Id).Select(x => x.First()).OrderBy(x => x.Id).ToList();
|
|
|
+ }
|
|
|
+
|
|
|
return viewPermissionData;
|
|
|
}
|
|
|
|
|
|
+ /// <summary>
|
|
|
+ /// 初始化配置权限
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="groupId"></param>
|
|
|
+ /// <param name="currUserId"></param>
|
|
|
+ /// <returns></returns>
|
|
|
+ public async Task<bool> InitPerm(int groupId,int currUserId)
|
|
|
+ {
|
|
|
+ var feeBasePerm = AppSettingsHelper.Get<FeeBasePermView>("FeeBasePerm");
|
|
|
+ var intlDplmcyBasePerm = new List<PermissionViewUserview>(); //国交部
|
|
|
+ var mktStratBasePerm = new List<PermissionViewUserview>(); //市场部
|
|
|
+
|
|
|
+ if (feeBasePerm.Any())
|
|
|
+ {
|
|
|
+ var intlDplmcyData = feeBasePerm.Find(x => x.Dept.Equals("IntlDplmcy"));
|
|
|
+ if (intlDplmcyData != null) if (intlDplmcyData.Users.Any()) intlDplmcyBasePerm = intlDplmcyData.Users.ToList();
|
|
|
+
|
|
|
+ var mktStratData = feeBasePerm.Find(x => x.Dept.Equals("MktStrat"));
|
|
|
+ if (mktStratData != null) if (mktStratData.Users.Any()) mktStratBasePerm = mktStratData.Users.ToList();
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ * 权限分配规则
|
|
|
+ * 刘琪、王鸽、朱琳的账号：默认只能刘、王、朱查看
|
|
|
+ * 舒庆的账号 默认只能舒、刘、王、朱查看
|
|
|
+ * 其他销售 默认只能自己、舒、刘、王、朱查看
|
|
|
+ */
|
|
|
+ var feeBasePermIds = new List<int>();
|
|
|
+ if (intlDplmcyBasePerm.Any(x => x.Id == currUserId))
|
|
|
+ {
|
|
|
+ feeBasePermIds = intlDplmcyBasePerm.Select(x => x.Id).ToList();
|
|
|
+ }
|
|
|
+ else if (mktStratBasePerm.Any(x => x.Id == currUserId))
|
|
|
+ {
|
|
|
+ feeBasePermIds.AddRange(mktStratBasePerm.Select(x => x.Id).ToList());
|
|
|
+ feeBasePermIds.AddRange(intlDplmcyBasePerm.Select(x => x.Id).ToList());
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ feeBasePermIds.Add(currUserId);
|
|
|
+ feeBasePermIds.AddRange(mktStratBasePerm.Select(x => x.Id).ToList());
|
|
|
+ feeBasePermIds.AddRange(intlDplmcyBasePerm.Select(x => x.Id).ToList());
|
|
|
+ }
|
|
|
+
|
|
|
+ if (feeBasePermIds.Any())
|
|
|
+ {
|
|
|
+ var permissions = new List<Grp_EnterExitCostPermission>();
|
|
|
+ foreach (var userId in feeBasePermIds)
|
|
|
+ {
|
|
|
+ permissions.Add(new Grp_EnterExitCostPermission()
|
|
|
+ {
|
|
|
+ GroupId = groupId,
|
|
|
+ UserId = userId,
|
|
|
+ Permission = 1,
|
|
|
+ CreateUserId = currUserId,
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ if (permissions.Any())
|
|
|
+ {
|
|
|
+ await _sqlSugar.Insertable(permissions).ExecuteReturnIdentityAsync();
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 出入境费用正式 --> 权限验证
|
|
|
/// </summary>
|
|
|
/// <param name="groupId">团组Id</param>
|
|
|
+ /// <param name="userId">用户Id</param>
|
|
|
/// <param name="permission">操作权限 1:查看;2:新增;3:编辑;4:删除;5:下载; </param>
|
|
|
/// <returns></returns>
|
|
|
public async Task<bool> PermissionValidationAsync(int groupId, int userId, int permission = 1)
|
|
|
@@ -61,14 +154,29 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
var permissionIds = new List<int>() { 1, 2, 3, 4, 5 };
|
|
|
if (!permissionIds.Contains(permission)) return false;
|
|
|
|
|
|
+ var feeBasePerm = AppSettingsHelper.Get<FeeBasePermView>("FeeBasePerm");
|
|
|
+ var feeBasePermUserIds = new List<int>();
|
|
|
+
|
|
|
+ if (feeBasePerm.Any())
|
|
|
+ {
|
|
|
+ var intlDplmcyData = feeBasePerm.Find(x => x.Dept.Equals("IntlDplmcy"));
|
|
|
+ if (intlDplmcyData != null) if (intlDplmcyData.Users.Any()) feeBasePermUserIds.AddRange(intlDplmcyData.Users.Select(x=>x.Id).ToList());
|
|
|
+
|
|
|
+ var mktStratData = feeBasePerm.Find(x => x.Dept.Equals("MktStrat"));
|
|
|
+ if (mktStratData != null) if (mktStratData.Users.Any()) feeBasePermUserIds.AddRange(mktStratData.Users.Select(x => x.Id).ToList());
|
|
|
+ }
|
|
|
+
|
|
|
+ if (feeBasePermUserIds.Any(x => x == userId)) return true;
|
|
|
+
|
|
|
var info = await _sqlSugar.Queryable<Grp_EnterExitCostPermission>()
|
|
|
- .Where(it => it.GroupId == groupId && it.UserId == userId && it.Permission == permission)
|
|
|
- .FirstAsync();
|
|
|
+ .Where(it => it.GroupId == groupId && it.UserId == userId && it.Permission == permission)
|
|
|
+ .FirstAsync();
|
|
|
if (info != null) return true;
|
|
|
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 更新出入境费用汇率信息
|
|
|
/// </summary>
|
|
|
@@ -107,48 +215,45 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
/// <param name="currUserId"></param>
|
|
|
/// <param name="permissionType">1 查看 2 编辑</param>
|
|
|
/// <returns></returns>
|
|
|
- public async Task<(bool, string)> MobilePermissionsValidationAsync(int groupId,int currUserId,int permissionType = 1)
|
|
|
+ public async Task<(bool, string)> MobilePermissionsValidationAsync(int groupId, int currUserId, int permissionType = 1)
|
|
|
{
|
|
|
- bool status = false;
|
|
|
string msg = string.Empty;
|
|
|
+ bool assignPerm = await PermissionValidationAsync(groupId, currUserId);//分配权限
|
|
|
|
|
|
- var enterExitCostData = await _sqlSugar.Queryable<Grp_EnterExitCost>().OrderByDescending(x => x.CreateTime).FirstAsync(it => it.DiId == groupId && it.IsDel == 0);
|
|
|
+ var enterExitCostData = await _sqlSugar
|
|
|
+ .Queryable<Grp_EnterExitCost>()
|
|
|
+ .OrderByDescending(x => x.CreateTime)
|
|
|
+ .FirstAsync(it => it.DiId == groupId && it.IsDel == 0);
|
|
|
if (permissionType == 1)
|
|
|
{
|
|
|
- status = await PermissionValidationAsync(groupId, currUserId);//查看权限
|
|
|
- if (enterExitCostData.CreateUserId == currUserId) status = true; //查看权限
|
|
|
- if (!status)
|
|
|
- {
|
|
|
- var setUserName = await _sqlSugar.Queryable<Sys_Users>().Where(x => x.Id == enterExitCostData.CreateUserId).Select(x => x.CnName).FirstAsync();
|
|
|
|
|
|
- msg = $"{setUserName}设置了你不能查看当前团组的出入境费用明细数据，如要查看，请联系{setUserName}!";
|
|
|
+ if (!assignPerm || enterExitCostData.CreateUserId != currUserId)
|
|
|
+ {
|
|
|
+ msg = $"未分配查看权限，如要查看，请联系市场部或国交部负责人!";
|
|
|
}
|
|
|
- return (status, msg);
|
|
|
+ return (true, msg);
|
|
|
}
|
|
|
else if (permissionType == 2)
|
|
|
{
|
|
|
- if (enterExitCostData.CreateUserId == currUserId) status = true; //编辑权限
|
|
|
- if (!status)
|
|
|
+ //if (enterExitCostData.CreateUserId == currUserId) status = true; //编辑权限
|
|
|
+ if (!assignPerm || enterExitCostData.CreateUserId != currUserId)
|
|
|
{
|
|
|
- var setUserName = await _sqlSugar.Queryable<Sys_Users>().Where(x => x.Id == enterExitCostData.CreateUserId).Select(x => x.CnName).FirstAsync();
|
|
|
-
|
|
|
- msg = $"您没有编辑权限，“{setUserName}”才可编辑!";
|
|
|
+ msg = $"未分配编辑权限，如要编辑，请联系市场部或国交部负责人!";
|
|
|
}
|
|
|
- return (status, msg);
|
|
|
+ return (true, msg);
|
|
|
|
|
|
}
|
|
|
else msg = $"请传入正确的权限验证类型!";
|
|
|
- return (status, msg);
|
|
|
+ return (false, msg);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/// <summary>
|
|
|
/// 查询 根据 Diid 查询
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
public async Task<JsonView> GetEnterExitCostInfoByDiId(EnterExitCostInfobyDiIdDto dto)
|
|
|
{
|
|
|
- var result = new JsonView() { Code = 400 , Msg = "暂无数据" };
|
|
|
+ var result = new JsonView() { Code = 400, Msg = "暂无数据" };
|
|
|
|
|
|
var enterExitCostData = await _sqlSugar.Queryable<Grp_EnterExitCost>().OrderByDescending(x => x.CreateTime).FirstAsync(it => it.DiId == dto.DiId && it.IsDel == 0);
|
|
|
|
|
|
@@ -162,28 +267,30 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
{
|
|
|
enterExitCostInfoView = _mapper.Map<EnterExitCostInfoView>(enterExitCostData);
|
|
|
|
|
|
- var isView = await PermissionValidationAsync(dto.DiId, dto.CurrUserId);
|
|
|
- if (isView) enterExitCostInfoView.IsView = true; //查看权限
|
|
|
-
|
|
|
- if (enterExitCostData.CreateUserId == dto.CurrUserId) {
|
|
|
+ bool assignPerm = await PermissionValidationAsync(dto.DiId, dto.CurrUserId);
|
|
|
+ if (assignPerm || enterExitCostData.CreateUserId == dto.CurrUserId)
|
|
|
+ {
|
|
|
enterExitCostInfoView.IsSave = true; //操作权限
|
|
|
enterExitCostInfoView.IsView = true; //查看权限
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- if (!enterExitCostInfoView.IsView)
|
|
|
+ else
|
|
|
{
|
|
|
- var setUserName = await _sqlSugar.Queryable<Sys_Users>().Where(x => x.Id == enterExitCostData.CreateUserId).Select(x => x.CnName).FirstAsync();
|
|
|
-
|
|
|
- result.Msg = $"{setUserName}设置了你不能查看当前团组的出入境费用明细数据，如要查看，请联系{setUserName}!";
|
|
|
+ result.Msg = $"未分配查看权限，如要查看，请联系市场部或国交部负责人!";
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- enterExitCostInfoView.ViewUsers = await _sqlSugar
|
|
|
- .Queryable<Grp_EnterExitCostPermission>()
|
|
|
- .Where(x => x.IsDel == 0 && x.GroupId == dto.DiId)
|
|
|
- .Select(x => x.UserId)
|
|
|
- .ToArrayAsync();
|
|
|
+ //设置权限按钮
|
|
|
+ var feeBasePerm = AppSettingsHelper.Get<PermissionViewUserview>("FeeBasePerm");
|
|
|
+ if (feeBasePerm.Any(x => x.Id == dto.CurrUserId))
|
|
|
+ {
|
|
|
+ enterExitCostInfoView.IsAssignPerm = true;
|
|
|
+
|
|
|
+ enterExitCostInfoView.ViewUsers = await _sqlSugar
|
|
|
+ .Queryable<Grp_EnterExitCostPermission>()
|
|
|
+ .Where(x => x.IsDel == 0 && x.GroupId == dto.DiId)
|
|
|
+ .Select(x => x.UserId)
|
|
|
+ .ToArrayAsync();
|
|
|
+ }
|
|
|
|
|
|
//enterExitCostInfoView.FirstItemRemark = enterExitCostData.Remark;
|
|
|
var dayAndCostSql = string.Format(@"Select ntf.Country,ntf.City,ssd.Name CurremcyCode,ssd.Remark CurrencyName,gdac.* From Grp_DayAndCost gdac
|
|
|
@@ -192,27 +299,26 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
Where gdac.Isdel = 0 And ntf.IsDel = 0 And gdac.DiId = {0} Order By [Type] ASC,[Days] ASC", dto.DiId);
|
|
|
var dayAndCostData = await _sqlSugar.SqlQueryable<DayAndCostInfoView>(dayAndCostSql).ToListAsync();
|
|
|
|
|
|
-
|
|
|
enterExitCostInfoView.QuarterageData = dayAndCostData.Where(it => it.Type == 1).ToList(); //住宿费 1
|
|
|
enterExitCostInfoView.BoardWagesData = dayAndCostData.Where(it => it.Type == 2).ToList(); //伙食费 2
|
|
|
enterExitCostInfoView.MiscellaneousFeeData = dayAndCostData.Where(it => it.Type == 3).ToList(); //公杂费 3
|
|
|
enterExitCostInfoView.TrainingExpenseData = dayAndCostData.Where(it => it.Type == 4).ToList(); //培训费 4
|
|
|
|
|
|
enterExitCostInfoView.DayOtherPriceData = _sqlSugar.Queryable<Grp_DayOtherPrice>()
|
|
|
- .Where(x => x.IsDel == 0 && x.Diid == dto.DiId)
|
|
|
- .OrderBy(x => x.Index)
|
|
|
- .Select(x => new DayOtherPriceView
|
|
|
- {
|
|
|
- DiId = x.Diid,
|
|
|
- Id = x.Id,
|
|
|
- Cost = x.Cost,
|
|
|
- Currency = x.Currency,
|
|
|
- Index = x.Index,
|
|
|
- SetDataId = x.SetDataId,
|
|
|
- SubTotal = x.SubTotal,
|
|
|
- Remark = x.Remark,
|
|
|
- })
|
|
|
- .ToList();
|
|
|
+ .Where(x => x.IsDel == 0 && x.Diid == dto.DiId)
|
|
|
+ .OrderBy(x => x.Index)
|
|
|
+ .Select(x => new DayOtherPriceView
|
|
|
+ {
|
|
|
+ DiId = x.Diid,
|
|
|
+ Id = x.Id,
|
|
|
+ Cost = x.Cost,
|
|
|
+ Currency = x.Currency,
|
|
|
+ Index = x.Index,
|
|
|
+ SetDataId = x.SetDataId,
|
|
|
+ SubTotal = x.SubTotal,
|
|
|
+ Remark = x.Remark,
|
|
|
+ })
|
|
|
+ .ToList();
|
|
|
|
|
|
enterExitCostInfoView.Currencys = (List<CurrencyInfo>?)CommonFun.GetCurrencyChinaToList(enterExitCostData.CurrencyRemark);
|
|
|
|
|
|
@@ -252,7 +358,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
mobileInfo = _mapper.Map<EnterExitCostMobileInfoView>(enterExitCostData);
|
|
|
|
|
|
var dayAndCostData = _sqlSugar.Queryable<Grp_DayAndCost>()
|
|
|
- .LeftJoin<Grp_NationalTravelFee>((dac,ntf) => dac.NationalTravelFeeId == ntf.Id)
|
|
|
+ .LeftJoin<Grp_NationalTravelFee>((dac, ntf) => dac.NationalTravelFeeId == ntf.Id)
|
|
|
.LeftJoin<Sys_SetData>((dac, ntf, sd) => dac.Currency == sd.Id)
|
|
|
.Where((dac, ntf, sd) => dac.IsDel == 0 && dac.DiId == dto.DiId)
|
|
|
.Select((dac, ntf, sd) => new DayAndCostMobileInfoView
|
|
|
@@ -262,7 +368,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
Type = dac.Type,
|
|
|
Days = dac.Days,
|
|
|
NationalTravelFeeId = dac.NationalTravelFeeId,
|
|
|
- Arae = $"{ntf.Country}-{ntf.City}",
|
|
|
+ Arae = $"{ntf.Country}-{ntf.City}",
|
|
|
Cost = dac.Cost,
|
|
|
Currency = dac.Currency,
|
|
|
CurrencyName = sd.Name,
|
|
|
@@ -271,7 +377,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
.ToList();
|
|
|
|
|
|
mobileInfo.ChoiceOneTotalCost = enterExitCostData.InsidePay;
|
|
|
- mobileInfo.ChoiceOneDetails = new ChoiceOneMobileInfoView() {
|
|
|
+ mobileInfo.ChoiceOneDetails = new ChoiceOneMobileInfoView()
|
|
|
+ {
|
|
|
Visa = enterExitCostData.Visa,
|
|
|
VisaRemark = enterExitCostData.VisaRemark,
|
|
|
YiMiao = enterExitCostData.YiMiao,
|
|
|
@@ -280,10 +387,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
Ticket = enterExitCostData.Ticket,
|
|
|
Safe = enterExitCostData.Safe,
|
|
|
};
|
|
|
- mobileInfo.ChoiceTwoDetails = new ChoiceTwoMobileInfoView()
|
|
|
- {
|
|
|
- AirJJ = enterExitCostData.AirJJ,
|
|
|
- AirGW = enterExitCostData.AirGW,
|
|
|
+ mobileInfo.ChoiceTwoDetails = new ChoiceTwoMobileInfoView()
|
|
|
+ {
|
|
|
+ AirJJ = enterExitCostData.AirJJ,
|
|
|
+ AirGW = enterExitCostData.AirGW,
|
|
|
AirTD = enterExitCostData.AirTD,
|
|
|
CityTranffic = enterExitCostData.CityTranffic
|
|
|
};
|
|
|
@@ -291,11 +398,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
mobileInfo.ChoiceFourDetails = dayAndCostData.Where(it => it.Type == 2).OrderBy(it => it.Days).ToArray(); //伙食费 2
|
|
|
mobileInfo.ChoiceFiveDetails = dayAndCostData.Where(it => it.Type == 3).OrderBy(it => it.Days).ToArray(); //公杂费 3
|
|
|
mobileInfo.ChoiceSixDetails = dayAndCostData.Where(it => it.Type == 4).OrderBy(it => it.Days).ToArray(); //培训费 4
|
|
|
-
|
|
|
+
|
|
|
//其他款项
|
|
|
mobileInfo.OtherExpensesDetails = _sqlSugar.Queryable<Grp_DayOtherPrice>()
|
|
|
- .LeftJoin<Sys_SetData>((dop,sd1) => dop.SetDataId == sd1.Id)
|
|
|
- .LeftJoin<Sys_SetData>((dop, sd1,sd2) => dop.Currency == sd2.Id)
|
|
|
+ .LeftJoin<Sys_SetData>((dop, sd1) => dop.SetDataId == sd1.Id)
|
|
|
+ .LeftJoin<Sys_SetData>((dop, sd1, sd2) => dop.Currency == sd2.Id)
|
|
|
.Where((dop, sd1, sd2) => dop.IsDel == 0 && dop.Diid == dto.DiId)
|
|
|
.OrderBy((dop, sd1, sd2) => dop.Index)
|
|
|
.Select((dop, sd1, sd2) => new DayOtherPriceMobileInfoView
|
|
|
@@ -370,38 +477,22 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
try
|
|
|
{
|
|
|
int enterExitId = 0;
|
|
|
-
|
|
|
+
|
|
|
if (enterExitCost.Id > 0) //修改
|
|
|
{
|
|
|
- //操作权限验证 只有创建人可修改
|
|
|
- var info = await _sqlSugar.Queryable<Grp_EnterExitCost,Sys_Users>((eec,u) => new JoinQueryInfos(JoinType.Left,eec.CreateUserId == u.Id))
|
|
|
- .Where((eec, u) => eec.IsDel == 0 && eec.Id == enterExitCost.Id)
|
|
|
- .Select((eec, u) => new { eec.CreateUserId,u.CnName })
|
|
|
- .FirstAsync();
|
|
|
- if (info.CreateUserId != dto.UserId)
|
|
|
+ //操作权限验证 可查看人员亦可编辑
|
|
|
+ var assignPerm = await PermissionValidationAsync(enterExitCost.DiId, dto.UserId);
|
|
|
+ if (!assignPerm)
|
|
|
{
|
|
|
-
|
|
|
_sqlSugar.RollbackTran();
|
|
|
- result.Msg = $"该条信息只有操作人“{info.CnName}”可修改!";
|
|
|
+ result.Msg = "未分配编辑权限，如要编辑，请联系市场部或国交部负责人!";
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- //修改验证
|
|
|
- //IsConfirm == 2 不可修改
|
|
|
- //var info = _sqlSugar.Queryable<Grp_EnterExitCost>().Where(it => it.IsDel == 0 && it.Id == enterExitCost.Id).First();
|
|
|
- //if (info.IsConfirm == 2)
|
|
|
- //{
|
|
|
- // result.Msg = "该团出入境费用已确认!不可更改!!";
|
|
|
- // return result;
|
|
|
- //}
|
|
|
-
|
|
|
var updateId = _sqlSugar.Updateable<Grp_EnterExitCost>(enterExitCost)
|
|
|
- .IgnoreColumns(it => new { it.DeleteUserId, it.DeleteTime, it.CreateUserId, it.CreateTime, it.IsDel })
|
|
|
- .ExecuteCommand();
|
|
|
- if (updateId > 0)
|
|
|
- {
|
|
|
- enterExitId = enterExitCost.Id;
|
|
|
- }
|
|
|
+ .IgnoreColumns(it => new { it.DeleteUserId, it.DeleteTime, it.CreateUserId, it.CreateTime, it.IsDel })
|
|
|
+ .ExecuteCommand();
|
|
|
+ if (updateId > 0) enterExitId = enterExitCost.Id;
|
|
|
else
|
|
|
{
|
|
|
_sqlSugar.RollbackTran();
|
|
|
@@ -413,12 +504,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
{
|
|
|
//效重 根据团组Id
|
|
|
var info = _sqlSugar.Queryable<Grp_EnterExitCost>().Where(it => it.IsDel == 0 && it.DiId == dto.DiId).First();
|
|
|
- if (info != null )
|
|
|
+ if (info != null)
|
|
|
{
|
|
|
_sqlSugar.RollbackTran();
|
|
|
result.Msg = "该团组相关数据已存在,请勿重新添加!";
|
|
|
return result;
|
|
|
-
|
|
|
}
|
|
|
|
|
|
//添加
|
|
|
@@ -430,28 +520,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- //默认添加查看权限
|
|
|
- var users = await PermissionViewUsersAsync();
|
|
|
- var userIds = users.Select(x => x.Id).ToList();
|
|
|
- if (userIds.Any())
|
|
|
- {
|
|
|
- var permissions = new List<Grp_EnterExitCostPermission>();
|
|
|
- foreach (var userId in userIds)
|
|
|
- {
|
|
|
- permissions.Add(new Grp_EnterExitCostPermission()
|
|
|
- {
|
|
|
- GroupId = enterExitId,
|
|
|
- UserId = userId,
|
|
|
- Permission = 1,
|
|
|
- CreateUserId = dto.UserId,
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- if (permissions.Any())
|
|
|
- {
|
|
|
- _sqlSugar.Insertable(permissions).ExecuteReturnIdentity();
|
|
|
- }
|
|
|
- }
|
|
|
+ //初始化权限（查看、编辑）
|
|
|
+ await InitPerm(dto.DiId, dto.UserId);
|
|
|
}
|
|
|
|
|
|
if (enterExitId > 0)
|
|
|
@@ -485,7 +555,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
}
|
|
|
else result.Msg = MsgTips.Port;
|
|
|
|
|
|
-
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
@@ -515,7 +584,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
.SetColumns(x => new Grp_EnterExitCost() { IsConfirm = confirm })
|
|
|
.Where(x => x.Id == dto.Id)
|
|
|
.ExecuteCommandAsync();
|
|
|
- if (update>0)
|
|
|
+ if (update > 0)
|
|
|
{
|
|
|
_view.Code = 200;
|
|
|
_view.Msg = "操作成功!";
|
|
|
@@ -624,7 +693,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
if (userId < 1) return result = new Result() { Code = -1, Msg = "请传入有效的UserId参数!" };
|
|
|
|
|
|
BeginTran();
|
|
|
- Grp_EnterExitCost _EnterExitCost = new Grp_EnterExitCost() {
|
|
|
+ Grp_EnterExitCost _EnterExitCost = new Grp_EnterExitCost()
|
|
|
+ {
|
|
|
Id = id,
|
|
|
IsDel = 1,
|
|
|
DeleteUserId = userId,
|
|
|
@@ -633,14 +703,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
|
|
|
//int update = await _sqlSugar.Updateable<Grp_EnterExitCost>(_EnterExitCost).Where(it => it.Id == id).ExecuteCommandAsync();
|
|
|
int update = await _sqlSugar.Updateable<Grp_EnterExitCost>(_EnterExitCost)
|
|
|
- .UpdateColumns(it => new {
|
|
|
- it.IsDel,
|
|
|
- it.DeleteUserId ,
|
|
|
- it.DeleteTime
|
|
|
- })
|
|
|
- .Where(it => it.Id == id).ExecuteCommandAsync();
|
|
|
-
|
|
|
- if (update > 0) {
|
|
|
+ .UpdateColumns(it => new
|
|
|
+ {
|
|
|
+ it.IsDel,
|
|
|
+ it.DeleteUserId,
|
|
|
+ it.DeleteTime
|
|
|
+ })
|
|
|
+ .Where(it => it.Id == id).ExecuteCommandAsync();
|
|
|
+
|
|
|
+ if (update > 0)
|
|
|
+ {
|
|
|
string sqlDelete = string.Format(@"Delete From Grp_DayAndCost Where Diid = {0} ", diId);
|
|
|
await ExecuteCommandAsync(sqlDelete);
|
|
|
result.Code = 0;
|
|
|
@@ -652,7 +724,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
result.Msg = "操作失败";
|
|
|
RollbackTran();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return result;
|
|
|
}
|
|
|
|
yuanrf