From e40889177c25035496c526dbc12a9665d5b61ceb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 20 三月 2025 12:00:53 +0800
Subject: [PATCH] 优化小区房屋和小区业主 支持按小区查询数据
---
service-user/src/main/java/com/java110/user/cmd/role/ListStaffsNoRoleCmd.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/role/ListStaffsNoRoleCmd.java b/service-user/src/main/java/com/java110/user/cmd/role/ListStaffsNoRoleCmd.java
index 6554dd9..4d20e14 100644
--- a/service-user/src/main/java/com/java110/user/cmd/role/ListStaffsNoRoleCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/role/ListStaffsNoRoleCmd.java
@@ -17,10 +17,12 @@
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.kafka.listener.ListenerUtils;
import java.util.ArrayList;
import java.util.List;
@@ -65,6 +67,7 @@
privilegeUserDto.setUserName(reqJson.getString("searchUserName"));
privilegeUserDto.setPage(Integer.parseInt(reqJson.getString("page")));
privilegeUserDto.setRow(Integer.parseInt(reqJson.getString("row")));
+ privilegeUserDto.setLevelCd(UserDto.LEVEL_CD_STAFF);
// 鍒ゆ柇鏄笉鏄鐞嗗憳锛岀鐞嗗憳鍙嶉 鐗╀笟 鐨勬墍瑙掕壊
UserDto userDto = new UserDto();
@@ -79,12 +82,12 @@
basePrivilegeDto.setResource("/viewAllOrganization");
basePrivilegeDto.setUserId(userId);
List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
- if (privileges.size() == 0) {
+ if (ListUtil.isNull(privileges)) {
//鏌ヨ鍛樺伐鎵�灞炰簩绾х粍缁囨灦鏋�
OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
orgStaffRelDto.setStaffId(reqJson.getString("userId"));
List<OrgStaffRelDto> orgStaffRelDtos = iOrgStaffRelInnerServiceSMO.queryOrgInfoByStaffIdsNew(orgStaffRelDto);
- if (orgStaffRelDtos.size() > 0) {
+ if (!ListUtil.isNull(orgStaffRelDtos)) {
List<String> haveOrgList = new ArrayList<String>();
for (OrgStaffRelDto orgStaffRelDto1 : orgStaffRelDtos) {
OrgDto orgDto1 = new OrgDto();
--
Gitblit v1.8.0