diff --git a/cloud-property-server/src/main/java/com/muyu/server/mapper/DataRunNameMapper.java b/cloud-property-server/src/main/java/com/muyu/server/mapper/DataRunNameMapper.java index d9b0baa..64aa1b7 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/mapper/DataRunNameMapper.java +++ b/cloud-property-server/src/main/java/com/muyu/server/mapper/DataRunNameMapper.java @@ -77,5 +77,5 @@ public interface DataRunNameMapper { int delDeptAssetAccredit(@Param("deptId") Integer deptId); - int delDeptAssetAccreditDept(@Param("userId") Integer userId); + int delUserAssetAccreditDept(@Param("userId") Integer userId); } diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java index a9ccadd..8f0eafa 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java @@ -35,33 +35,31 @@ public class AssetAuthorizationServiceImpl @Override public int delUserAssetAccredit(AssetAuthorization req) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (null==req.getBasicId()){ - queryWrapper.eq(AssetAuthorization::getUserId,req.getUserId()) - .eq(AssetAuthorization::getTableId,req.getTableId()); - }else if (null==req.getTableId()){ - queryWrapper.eq(AssetAuthorization::getUserId,req.getUserId()) - .eq(AssetAuthorization::getBasicId,req.getBasicId()); +// if (null==req.getBasicId()){ +// queryWrapper.eq(AssetAuthorization::getUserId,req.getUserId()) +// .eq(AssetAuthorization::getTableId,req.getTableId()); +// }else if (null==req.getTableId()){ +// queryWrapper.eq(AssetAuthorization::getUserId,req.getUserId()) +// .eq(AssetAuthorization::getBasicId,req.getBasicId()); +// } + if (null==req.getDeptId()) { + return 0; } - - int delete = assetAuthorizationMapper.delete(queryWrapper); - return delete; + int delete = dataRunNameMapper.delUserAssetAccreditDept(req.getDeptId()); + return delete; } @Override public int delDeptAssetAccredit(AssetAuthorization req) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (null==req.getDeptId()){ + if (null==req.getDeptId()) { // queryWrapper.eq(AssetAuthorization::getDeptId,req.getDeptId()) // .eq(AssetAuthorization::getTableId,req.getTableId()); + return 0; + } + int delete = dataRunNameMapper.delDeptAssetAccredit(req.getDeptId()); return delete; - }else if(null==req.getUserId()){ -// queryWrapper.eq(AssetAuthorization::getDeptId,req.getDeptId()) -// .eq(AssetAuthorization::getBasicId,req.getBasicId()); - int delete = dataRunNameMapper.delDeptAssetAccreditDept(req.getUserId()); - return delete; - } - return 0; } /**