From 42b094b137f12a70578e3be9920d05f98de823d5 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期一, 22 二月 2021 15:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
index 6a47e51..c5da938 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -121,7 +121,6 @@
queryWrapper.eq("a.delFlag", 0);
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
String querySql = empAccessoryMapper.getQuerySql();
- return empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
return mapIPage;
}
@@ -254,4 +253,13 @@
FileUtil.del(new StringBuilder().append(mianFileStr, 0, mianFileStr.length() - 1).append(".zip").toString());
FileUtil.del(mianFileStr);
}
+
+
+ @Override
+ public Integer getLabelCount(Long labelId) {
+ LambdaQueryWrapper<EmpAccessory> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(EmpAccessory::getDelFlag,0);
+ wrapper.eq(EmpAccessory::getLabelid,labelId);
+ return this.count(wrapper);
+ }
}
--
Gitblit v1.8.0