From b63f41b8a0cfce68770e5cb02c8dd3fd994f0c59 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期二, 22 七月 2025 18:37:54 +0800
Subject: [PATCH] 修改费用导入模块2025/07/22
---
service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java
index 2fa4a0f..77ea2be 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java
@@ -92,16 +92,17 @@
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
Assert.hasKeyAndValue(reqJson, "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
Assert.hasKeyAndValue(reqJson, "row", "璇锋眰鎶ユ枃涓湭鍖呭惈rows鑺傜偣");
- if (!reqJson.containsKey("storeId")) {
- String storeId = context.getReqHeaders().get("store-id");
- reqJson.put("storeId", storeId);
- }
+
+ String storeId = context.getReqHeaders().get("store-id");
+ reqJson.put("storeId", storeId);
+
Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId鑺傜偣");
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
UserDto userDto = BeanConvertUtil.covertBean(reqJson, UserDto.class);
+ userDto.setLevelCd(UserDto.LEVEL_CD_STAFF); // 杩欓噷鍙煡鍛樺伐涓嶆煡绠＄悊鍛�
String userId = context.getReqHeaders().get("user-id");
// 鍒ゆ柇鏄笉鏄鐞嗗憳锛岀鐞嗗憳鍙嶉 鐗╀笟 鐨勬墍瑙掕壊
UserDto userDto1 = new UserDto();
@@ -142,7 +143,7 @@
fileRelDto.setObjId(apiStaffDataVo.getUserId());
fileRelDto.setRelTypeCd("12000"); //鍛樺伐鍥剧墖
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
- if (fileRelDtos != null && fileRelDtos.size() > 0) {
+ if (!ListUtil.isNull(fileRelDtos)) {
List<String> urls = new ArrayList<>();
for (FileRelDto fileRel : fileRelDtos) {
urls.add(fileRel.getFileRealName());
@@ -165,7 +166,7 @@
}
private void refreshOrgs(List<ApiStaffDataVo> staffs, String storeId) {
- if (staffs == null || staffs.size() < 1) {
+ if (ListUtil.isNull(staffs)) {
return;
}
List<String> staffIds = new ArrayList<>();
@@ -175,14 +176,14 @@
OrgDto orgDto = new OrgDto();
orgDto.setStoreId(storeId);
List<OrgDto> orgDtos = orgV1InnerServiceSMOImpl.queryOrgs(orgDto);
- if (orgDtos == null || orgDtos.size() < 1) {
+ if (ListUtil.isNull(orgDtos)) {
return;
}
OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
orgStaffRelDto.setStaffIds(staffIds.toArray(new String[staffIds.size()]));
orgStaffRelDto.setStoreId(storeId);
List<OrgStaffRelDto> orgStaffRels = orgStaffRelV1InnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto);
- if (orgStaffRels == null || orgStaffRels.size() < 1) {
+ if (ListUtil.isNull(orgStaffRels)) {
return;
}
for (ApiStaffDataVo apiStaffDataVo : staffs) {
@@ -193,7 +194,7 @@
OrgDto org = new OrgDto();
org.setOrgId(tmpOrgStaffRelDto.getOrgId());
List<OrgDto> orgs = orgV1InnerServiceSMOImpl.queryOrgs(org);
- if (orgs == null || orgs.size() < 1) {
+ if (ListUtil.isNull(orgs)) {
continue;
}
apiStaffDataVo.setOrgId(tmpOrgStaffRelDto.getOrgId());
--
Gitblit v1.8.0