From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java
index d5ef8aa..ebafce2 100644
--- a/service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java
@@ -18,8 +18,8 @@
import com.java110.user.dao.IPrivilegeUserV1ServiceDao;
import com.java110.intf.user.IPrivilegeUserV1InnerServiceSMO;
-import com.java110.dto.privilegeUser.PrivilegeUserDto;
-import com.java110.po.privilegeUser.PrivilegeUserPo;
+import com.java110.dto.privilege.PrivilegeUserDto;
+import com.java110.po.privilege.PrivilegeUserPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.user.UserDto;
@@ -28,7 +28,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -106,4 +105,24 @@
return privilegeUsers;
}
+ @Override
+ public int queryStaffsNoRoleCount(@RequestBody PrivilegeUserDto privilegeUserDto) {
+ return privilegeUserV1ServiceDaoImpl.queryStaffsNoRoleCount(BeanConvertUtil.beanCovertMap(privilegeUserDto));
+ }
+
+ @Override
+ public List<UserDto> queryStaffsNoRoleInfos(@RequestBody PrivilegeUserDto privilegeUserDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = privilegeUserDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ privilegeUserDto.setPage((page - 1) * privilegeUserDto.getRow());
+ }
+
+ List<UserDto> privilegeUsers = BeanConvertUtil.covertBeanList(privilegeUserV1ServiceDaoImpl.queryStaffsNoRoleInfos(BeanConvertUtil.beanCovertMap(privilegeUserDto)), UserDto.class);
+
+ return privilegeUsers;
+ }
+
}
--
Gitblit v1.8.0