From fb7bd4da57428b5f16b4f90729fe8f497585d327 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 19 八月 2025 11:04:30 +0800
Subject: [PATCH] 合并0819
---
service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 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 2b48744..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
@@ -19,10 +19,7 @@
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.PinYinUtil;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.*;
import com.java110.vo.api.staff.ApiStaffDataVo;
import com.java110.vo.api.staff.ApiStaffVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+
@Java110CmdDoc(title = "鏌ヨ鍛樺伐",
description = "鏍规嵁鍛樺伐 鍚嶇О 鎵嬫満鍙风瓑鏌ヨ鍛樺伐淇℃伅",
httpMethod = "get",
@@ -52,19 +50,19 @@
@Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
@Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
@Java110ParamDoc(name = "staffs", type = "Object", remark = "鏈夋晥鏁版嵁"),
- @Java110ParamDoc(parentNodeName = "staffs",name = "userId", type = "String", remark = "鍛樺伐ID"),
- @Java110ParamDoc(parentNodeName = "staffs",name = "name", type = "String", remark = "鍛樺伐鍚嶇О"),
- @Java110ParamDoc(parentNodeName = "staffs",name = "orgName", type = "String", remark = "缁勭粐"),
- @Java110ParamDoc(parentNodeName = "staffs",name = "orgId", type = "String", remark = "缁勭粐ID"),
- @Java110ParamDoc(parentNodeName = "staffs",name = "relCdName", type = "String", remark = "宀椾綅"),
- @Java110ParamDoc(parentNodeName = "staffs",name = "tel", type = "String", remark = "鎵嬫満鍙�"),
- @Java110ParamDoc(parentNodeName = "staffs",name = "address", type = "String", remark = "鍦板潃"),
+ @Java110ParamDoc(parentNodeName = "staffs", name = "userId", type = "String", remark = "鍛樺伐ID"),
+ @Java110ParamDoc(parentNodeName = "staffs", name = "name", type = "String", remark = "鍛樺伐鍚嶇О"),
+ @Java110ParamDoc(parentNodeName = "staffs", name = "orgName", type = "String", remark = "缁勭粐"),
+ @Java110ParamDoc(parentNodeName = "staffs", name = "orgId", type = "String", remark = "缁勭粐ID"),
+ @Java110ParamDoc(parentNodeName = "staffs", name = "relCdName", type = "String", remark = "宀椾綅"),
+ @Java110ParamDoc(parentNodeName = "staffs", name = "tel", type = "String", remark = "鎵嬫満鍙�"),
+ @Java110ParamDoc(parentNodeName = "staffs", name = "address", type = "String", remark = "鍦板潃"),
}
)
@Java110ExampleDoc(
- reqBody="http://{ip}:{port}/app/query.staff.infos?page=1&row=10&orgId=102022091983800014&staffName=",
- resBody="{\"page\":0,\"records\":1,\"rows\":0,\"staffs\":[{\"address\":\"changzhi\",\"age\":0,\"email\":\"123@126.com\",\"initials\":\"H\",\"levelCd\":\"01\",\"name\":\"闊╀綑\",\"orgId\":\"842022090369280030\",\"orgLevel\":\"1\",\"orgName\":\"鏅嬮偦閫氭櫤鎱хぞ鍖� / 瀹変繚閮╘",\"parentOrgId\":\"-1\",\"parentTwoOrgId\":\"-1\",\"relCd\":\"1000\",\"relCdName\":\"鏅�氬憳宸",\"relId\":\"842022091914570040\",\"sex\":\"1\",\"storeId\":\"102022090382820025\",\"tel\":\"15033304901\",\"urls\":[\"img/20220919/5d258a09-0cea-407b-9da5-93da98a93760.jpg\"],\"userId\":\"302022091908980026\",\"userName\":\"闊╀綑\"},{\"address\":\"闀挎不\",\"age\":0,\"email\":\"sxjltwy@163.com\",\"initials\":\"H\",\"levelCd\":\"01\",\"name\":\"闊╀繛\",\"orgId\":\"842022090369280030\",\"orgLevel\":\"1\",\"orgName\":\"鏅嬮偦閫氭櫤鎱хぞ鍖� / 瀹変繚閮╘",\"parentOrgId\":\"-1\",\"parentTwoOrgId\":\"-1\",\"relCd\":\"4000\",\"relCdName\":\"閮ㄩ棬缁勯暱\",\"relId\":\"842022091910820017\",\"sex\":\"0\",\"storeId\":\"102022090382820025\",\"tel\":\"17633305226\",\"urls\":[\"img/20220906/98ff9c83-606e-4f1a-8f40-fbcdbb00c784.jpg\"],\"userId\":\"302022090609300172\",\"userName\":\"闊╀繛\"},{\"address\":\"闀挎不\",\"age\":0,\"email\":\"sxjltwy@163.com\",\"initials\":\"L\",\"levelCd\":\"01\",\"name\":\"鏉庣懚\",\"orgId\":\"842022090369280030\",\"orgLevel\":\"1\",\"orgName\":\"鏅嬮偦閫氭櫤鎱хぞ鍖� / 瀹変繚閮╘",\"parentOrgId\":\"-1\",\"parentTwoOrgId\":\"-1\",\"relCd\":\"1000\",\"relCdName\":\"鏅�氬憳宸",\"relId\":\"842022091967800024\",\"sex\":\"1\",\"storeId\":\"102022090382820025\",\"tel\":\"13032266195\",\"urls\":[\"img/20220916/b7acab38-e72e-4e20-8804-9a1d5fc5d18f.jpg\"],\"userId\":\"302022090656600168\",\"userName\":\"鏉庣懚\"},{\"address\":\"闀挎不\",\"age\":0,\"email\":\"sxjltwy@163.com\",\"initials\":\"W\",\"levelCd\":\"01\",\"name\":\"鐜嬪媷\",\"orgId\":\"842022090369280030\",\"orgLevel\":\"1\",\"orgName\":\"鏅嬮偦閫氭櫤鎱хぞ鍖� / 瀹変繚閮╘",\"parentOrgId\":\"-1\",\"parentTwoOrgId\":\"-1\",\"relCd\":\"8000\",\"relCdName\":\"鎬诲叕鍙告�荤粡鐞哱",\"relId\":\"842022091936110033\",\"sex\":\"0\",\"storeId\":\"102022090382820025\",\"tel\":\"15034504949\",\"urls\":[\"img/20220906/1dff150d-4f59-40b3-a9be-d437026e1b00.jpg\"],\"userId\":\"302022090645120164\",\"userName\":\"鐜嬪媷\"}],\"total\":1}"
+ reqBody = "http://{ip}:{port}/app/query.staff.infos?page=1&row=10&orgId=102022091983800014&staffName=",
+ resBody = "{\"page\":0,\"records\":1,\"rows\":0,\"staffs\":[{\"address\":\"changzhi\",\"age\":0,\"email\":\"123@126.com\",\"initials\":\"H\",\"levelCd\":\"01\",\"name\":\"闊╀綑\",\"orgId\":\"842022090369280030\",\"orgLevel\":\"1\",\"orgName\":\"鏅嬮偦閫氭櫤鎱хぞ鍖� / 瀹変繚閮╘",\"parentOrgId\":\"-1\",\"parentTwoOrgId\":\"-1\",\"relCd\":\"1000\",\"relCdName\":\"鏅�氬憳宸",\"relId\":\"842022091914570040\",\"sex\":\"1\",\"storeId\":\"102022090382820025\",\"tel\":\"15033304901\",\"urls\":[\"img/20220919/5d258a09-0cea-407b-9da5-93da98a93760.jpg\"],\"userId\":\"302022091908980026\",\"userName\":\"闊╀綑\"},{\"address\":\"闀挎不\",\"age\":0,\"email\":\"sxjltwy@163.com\",\"initials\":\"H\",\"levelCd\":\"01\",\"name\":\"闊╀繛\",\"orgId\":\"842022090369280030\",\"orgLevel\":\"1\",\"orgName\":\"鏅嬮偦閫氭櫤鎱хぞ鍖� / 瀹変繚閮╘",\"parentOrgId\":\"-1\",\"parentTwoOrgId\":\"-1\",\"relCd\":\"4000\",\"relCdName\":\"閮ㄩ棬缁勯暱\",\"relId\":\"842022091910820017\",\"sex\":\"0\",\"storeId\":\"102022090382820025\",\"tel\":\"17633305226\",\"urls\":[\"img/20220906/98ff9c83-606e-4f1a-8f40-fbcdbb00c784.jpg\"],\"userId\":\"302022090609300172\",\"userName\":\"闊╀繛\"},{\"address\":\"闀挎不\",\"age\":0,\"email\":\"sxjltwy@163.com\",\"initials\":\"L\",\"levelCd\":\"01\",\"name\":\"鏉庣懚\",\"orgId\":\"842022090369280030\",\"orgLevel\":\"1\",\"orgName\":\"鏅嬮偦閫氭櫤鎱хぞ鍖� / 瀹変繚閮╘",\"parentOrgId\":\"-1\",\"parentTwoOrgId\":\"-1\",\"relCd\":\"1000\",\"relCdName\":\"鏅�氬憳宸",\"relId\":\"842022091967800024\",\"sex\":\"1\",\"storeId\":\"102022090382820025\",\"tel\":\"13032266195\",\"urls\":[\"img/20220916/b7acab38-e72e-4e20-8804-9a1d5fc5d18f.jpg\"],\"userId\":\"302022090656600168\",\"userName\":\"鏉庣懚\"},{\"address\":\"闀挎不\",\"age\":0,\"email\":\"sxjltwy@163.com\",\"initials\":\"W\",\"levelCd\":\"01\",\"name\":\"鐜嬪媷\",\"orgId\":\"842022090369280030\",\"orgLevel\":\"1\",\"orgName\":\"鏅嬮偦閫氭櫤鎱хぞ鍖� / 瀹変繚閮╘",\"parentOrgId\":\"-1\",\"parentTwoOrgId\":\"-1\",\"relCd\":\"8000\",\"relCdName\":\"鎬诲叕鍙告�荤粡鐞哱",\"relId\":\"842022091936110033\",\"sex\":\"0\",\"storeId\":\"102022090382820025\",\"tel\":\"15034504949\",\"urls\":[\"img/20220906/1dff150d-4f59-40b3-a9be-d437026e1b00.jpg\"],\"userId\":\"302022090645120164\",\"userName\":\"鐜嬪媷\"}],\"total\":1}"
)
@Java110Cmd(serviceCode = "query.staff.infos")
public class QueryStaffInfosCmd extends Cmd {
@@ -94,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();
@@ -118,12 +117,12 @@
basePrivilegeDto.setResource("/viewAllOrganization");
basePrivilegeDto.setUserId(reqJson.getString("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();
@@ -144,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());
@@ -167,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<>();
@@ -177,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) {
@@ -195,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