|
@@ -9178,7 +9178,6 @@ FROM
|
|
|
WHERE
|
|
|
di.Isdel = 0 ", dto.CurrUserId);
|
|
|
|
|
|
-
|
|
|
var data = await _sqlSugar.SqlQueryable<EnterExitCostMobileGroupView>(sql)
|
|
|
.Where(x => !string.IsNullOrEmpty(x.GroupName))
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.GroupName) && diId > 0, x => x.Id == diId)
|
|
@@ -9386,8 +9385,8 @@ WHERE
|
|
|
if (eecInfo == null) return Ok(mobileInfo);
|
|
|
|
|
|
//验证查看权限
|
|
|
- (bool isView, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId);
|
|
|
- if (!isView) return Ok(JsonView(false, msg));
|
|
|
+ //(bool isView, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId);
|
|
|
+ //if (!isView) return Ok(JsonView(false, msg));
|
|
|
|
|
|
mobileInfo = _mapper.Map<EnterExitCostMobileParentInfoView>(eecInfo);
|
|
|
|
|
@@ -9486,8 +9485,8 @@ WHERE
|
|
|
if (!subTypes.Contains(dto.SubType)) return Ok(JsonView(false, $"请传入有效的subTypeId!"));
|
|
|
|
|
|
//验证查看权限
|
|
|
- (bool isView, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId);
|
|
|
- if (!isView) return Ok(JsonView(false, msg));
|
|
|
+ //(bool isView, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId);
|
|
|
+ //if (!isView) return Ok(JsonView(false, msg));
|
|
|
|
|
|
|
|
|
var eecInfo = await _sqlSugar.Queryable<Grp_EnterExitCost>().OrderByDescending(x => x.CreateTime).FirstAsync(it => it.DiId == dto.DiId && it.IsDel == 0);
|
|
@@ -9767,8 +9766,8 @@ WHERE
|
|
|
if (dto.UserIds.Length < 1) return Ok(JsonView(false, "请传入有效的userId;"));
|
|
|
|
|
|
//验证编辑权限
|
|
|
- (bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
- if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
+ //(bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
+ //if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
|
|
|
var permissions = new List<Grp_EnterExitCostPermission>();
|
|
|
foreach (var userId in dto.UserIds)
|
|
@@ -9826,9 +9825,9 @@ WHERE
|
|
|
}
|
|
|
else //update
|
|
|
{
|
|
|
- //验证编辑权限
|
|
|
- (bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
- if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
+ ////验证编辑权限
|
|
|
+ //(bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
+ //if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
|
|
|
var upd = await _sqlSugar.Updateable<Grp_EnterExitCost>().SetColumns(x => new Grp_EnterExitCost() { CurrencyRemark = currencyStr }).Where(x => x.Id == dto.Id).ExecuteCommandAsync();
|
|
|
if (upd < 1) return Ok(JsonView(false));
|
|
@@ -9950,9 +9949,9 @@ WHERE
|
|
|
}
|
|
|
else //update
|
|
|
{
|
|
|
- //验证编辑权限
|
|
|
- (bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
- if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
+ ////验证编辑权限
|
|
|
+ //(bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
+ //if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
|
|
|
var upd = await _sqlSugar.Updateable(checkboxInfo)
|
|
|
.UpdateColumns(x => new
|
|
@@ -10016,9 +10015,9 @@ WHERE
|
|
|
}
|
|
|
else //update
|
|
|
{
|
|
|
- //验证编辑权限
|
|
|
- (bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
- if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
+ ////验证编辑权限
|
|
|
+ //(bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
+ //if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
|
|
|
var upd = await _sqlSugar.Updateable<Grp_EnterExitCost>()
|
|
|
.SetColumnsIF(itemTypeId == 3, it => it.ChoiceThree == isSelected)
|
|
@@ -10062,9 +10061,9 @@ WHERE
|
|
|
}
|
|
|
else //update
|
|
|
{
|
|
|
- //验证编辑权限
|
|
|
- (bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
- if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
+ ////验证编辑权限
|
|
|
+ //(bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
+ //if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
|
|
|
var upd = await _sqlSugar.Updateable(info)
|
|
|
.UpdateColumns(x => new
|
|
@@ -10130,9 +10129,9 @@ WHERE
|
|
|
}
|
|
|
else //update
|
|
|
{
|
|
|
- //验证编辑权限
|
|
|
- (bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
- if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
+ ////验证编辑权限
|
|
|
+ //(bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
+ //if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
|
|
|
var upd = await _sqlSugar.Updateable(info)
|
|
|
.UpdateColumns(x => new
|
|
@@ -10277,9 +10276,9 @@ WHERE
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- //验证编辑权限
|
|
|
- (bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
- if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
+ ////验证编辑权限
|
|
|
+ //(bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.DiId, dto.CurrUserId, 2);
|
|
|
+ //if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
|
|
|
var subUpd = await _sqlSugar.Updateable(subInfo)
|
|
|
.UpdateColumns(x => new
|
|
@@ -10392,9 +10391,9 @@ WHERE
|
|
|
else //upd
|
|
|
{
|
|
|
|
|
|
- //验证编辑权限
|
|
|
- (bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.Diid, dto.CurrUserId, 2);
|
|
|
- if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
+ ////验证编辑权限
|
|
|
+ //(bool isEdit, string msg) = await _enterExitCostRep.MobilePermissionsValidationAsync(dto.Diid, dto.CurrUserId, 2);
|
|
|
+ //if (!isEdit) return Ok(JsonView(false, msg));
|
|
|
|
|
|
var subUpd = await _sqlSugar.Updateable(subInfo)
|
|
|
.UpdateColumns(x => new
|