From af6dd48ed508df2ff33f62cd5c40db3f51f9d2a8 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:38:13 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index a8dcc10..b7ba8c9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -326,6 +326,7 @@
         QueryWrapper<DeviceRole> queryWrapper = new QueryWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
         pageWrap.getModel().setIsdeleted(Constants.ZERO);
+        queryWrapper.select("*,(select count(1) from member_role b where b.isdeleted=0 and b.role_id=device_role.id) as memberNum");
         if (pageWrap.getModel().getId() != null) {
             queryWrapper.lambda().eq(DeviceRole::getId, pageWrap.getModel().getId());
         }
@@ -390,13 +391,13 @@
         queryWrapper.lambda().orderByAsc( DeviceRole::getName);
         IPage<DeviceRole> newPage = deviceRoleMapper.selectPage(page, queryWrapper);
         if(null != newPage && newPage.getRecords().size() > 0) {
-            List<DeviceRole> deviceRoleList = newPage.getRecords();
-            for (DeviceRole dto:deviceRoleList) {
+          List<DeviceRole> deviceRoleList = newPage.getRecords();
+          /*    for (DeviceRole dto:deviceRoleList) {
                 Member member = new Member();
                 member.setIsdeleted(Constants.ZERO);
                 member.setRoleIdParam("["+dto.getId()+"]");
                 dto.setMemberNum( memberMapper.selectCount(new QueryWrapper<>(member)));
-            }
+            }*/
             newPage.setRecords(deviceRoleList);
         }
         return PageData.from(newPage);

--
Gitblit v1.9.3