From 6e13e0fa577df5511157a7841617106bd2f5c0b2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 20 三月 2023 16:03:05 +0800
Subject: [PATCH] 1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug
---
service-community/src/main/java/com/java110/community/cmd/visit/QueryUndoVisitCmd.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/QueryUndoVisitCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/QueryUndoVisitCmd.java
index bad7652..9fe022d 100644
--- a/service-community/src/main/java/com/java110/community/cmd/visit/QueryUndoVisitCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/QueryUndoVisitCmd.java
@@ -20,6 +20,7 @@
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import com.java110.vo.api.visit.ApiVisitDataVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -92,7 +93,7 @@
refreshFormData(datas, reqJson);
// 杈撳叆flowId
- refreshSetting(datas,reqJson);
+ refreshSetting(datas, reqJson);
//鍒锋柊 涓氫富
refreshOwners(datas, reqJson);
@@ -110,12 +111,12 @@
private void refreshOwners(List<JSONObject> datas, JSONObject reqJson) {
- if(datas == null || datas.size() < 1){
- return ;
+ if (datas == null || datas.size() < 1) {
+ return;
}
List<String> ownerIds = new ArrayList<>();
- for(JSONObject apiVisitDataVo: datas){
+ for (JSONObject apiVisitDataVo : datas) {
ownerIds.add(apiVisitDataVo.getString("ownerId"));
}
@@ -123,16 +124,18 @@
ownerDto.setOwnerIds(ownerIds.toArray(new String[ownerIds.size()]));
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
ownerDto.setCommunityId(reqJson.getString("communityId"));
- List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+ List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
- for(JSONObject apiVisitDataVo: datas){
- for(OwnerDto tmpOwnerDto : ownerDtos){
- if(!apiVisitDataVo.getString("ownerId").equals(tmpOwnerDto.getOwnerId())){
- continue;
+ for (JSONObject apiVisitDataVo : datas) {
+ if (apiVisitDataVo.containsKey("ownerId") && StringUtil.isEmpty(apiVisitDataVo.getString("ownerId"))) {
+ for (OwnerDto tmpOwnerDto : ownerDtos) {
+ if (!StringUtil.isEmpty(apiVisitDataVo.getString("ownerId")) &&
+ !StringUtil.isEmpty(tmpOwnerDto.getOwnerId()) && !apiVisitDataVo.getString("ownerId").equals(tmpOwnerDto.getOwnerId())) {
+ continue;
+ }
+ apiVisitDataVo.put("ownerName", tmpOwnerDto.getName());
+ apiVisitDataVo.put("ownerTel", tmpOwnerDto.getLink());
}
- apiVisitDataVo.put("ownerName",tmpOwnerDto.getName());
- apiVisitDataVo.put("ownerTel",tmpOwnerDto.getLink());
-
}
}
@@ -173,12 +176,12 @@
return;
}
- if(datas == null || datas.size() < 1){
+ if (datas == null || datas.size() < 1) {
return;
}
- for(JSONObject data : datas){
- data.put("flowId",visitSettingDtos.get(0).getFlowId());
+ for (JSONObject data : datas) {
+ data.put("flowId", visitSettingDtos.get(0).getFlowId());
}
}
--
Gitblit v1.8.0