Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -9193,7 +9193,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)
@@ -9401,8 +9400,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);
 
@@ -9501,8 +9500,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);
@@ -9782,8 +9781,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)
@@ -9841,9 +9840,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));
@@ -9965,9 +9964,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
@@ -10031,9 +10030,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)
@@ -10077,9 +10076,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
@@ -10145,9 +10144,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
@@ -10292,9 +10291,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
@@ -10407,9 +10406,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