From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/ListRoomsWhereFeeSetCmd.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListRoomsWhereFeeSetCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListRoomsWhereFeeSetCmd.java
index 3d08922..e5a53df 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListRoomsWhereFeeSetCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListRoomsWhereFeeSetCmd.java
@@ -2,12 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.context.DataFlowContext;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.RoomDto;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.room.RoomDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.intf.community.IMenuInnerServiceSMO;
@@ -29,7 +28,7 @@
import java.util.Map;
@Java110Cmd(serviceCode = "fee.listRoomsWhereFeeSet")
-public class ListRoomsWhereFeeSetCmd extends AbstractServiceCmdListener {
+public class ListRoomsWhereFeeSetCmd extends Cmd {
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
@@ -52,8 +51,14 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
ApiRoomVo apiRoomVo = new ApiRoomVo();
+
+ String ownerName = reqJson.getString("ownerName");
+ String idCard = reqJson.getString("idCard");
+ String ownerNameLike = reqJson.getString("ownerNameLike");
+ //杩欓噷浼樺寲 userId 闂
+ reqJson.put("userId","");
//鏍规嵁 涓氫富鏉ュ畾浣嶆埧灞嬩俊鎭�
- if (reqJson.containsKey("ownerName") || reqJson.containsKey("idCard") || reqJson.containsKey("ownerNameLike")) {
+ if (!StringUtil.isEmpty(ownerName) || !StringUtil.isEmpty(idCard) || !StringUtil.isEmpty(ownerNameLike)) {
queryRoomByOwnerInfo(apiRoomVo, reqJson, cmdDataFlowContext);
return;
}
@@ -67,7 +72,7 @@
List<RoomDto> roomDtoList = roomInnerServiceSMOImpl.queryRooms(roomDto);
//鑾峰彇鎵嬫満鍙枫�佽韩浠借瘉鍙峰姞瀵嗘爣璇�
String flag = reqJson.getString("flag");
- refreshRoomOwners(reqJson.getString("userId"), reqJson.getString("communityId"), roomDtoList, flag);
+ refreshRoomOwners(reqJson.getString("loginUserId"), reqJson.getString("communityId"), roomDtoList, flag);
apiRoomVo.setRooms(BeanConvertUtil.covertBeanList(roomDtoList, ApiRoomDataVo.class));
} else {
--
Gitblit v1.8.0