From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/impl/StaffServiceSMOImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/impl/StaffServiceSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/impl/StaffServiceSMOImpl.java
index ec91ebb..bc7c77f 100644
--- a/service-api/src/main/java/com/java110/api/smo/impl/StaffServiceSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/impl/StaffServiceSMOImpl.java
@@ -5,8 +5,12 @@
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.org.OrgStaffRelDto;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.api.smo.IStaffServiceSMO;
+import com.java110.intf.community.IMenuInnerServiceSMO;
+import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
@@ -19,6 +23,9 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import java.util.List;
+import java.util.Map;
+
/**
* 鍛樺伐鏈嶅姟绫�
* Created by Administrator on 2019/4/2.
@@ -29,6 +36,12 @@
@Autowired
private RestTemplate restTemplate;
+
+ @Autowired
+ private IOrgStaffRelInnerServiceSMO iOrgStaffRelInnerServiceSMO;
+
+ @Autowired
+ private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
/**
* 娣诲姞鍛樺伐淇℃伅
@@ -81,12 +94,32 @@
Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "row", "璇锋眰鎶ユ枃涓湭鍖呭惈rows鑺傜偣");
+
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
Assert.isInteger(paramIn.getString("page"), "page涓嶆槸鏁板瓧");
Assert.isInteger(paramIn.getString("row"), "rows涓嶆槸鏁板瓧");
int page = Integer.parseInt(paramIn.getString("page"));
int rows = Integer.parseInt(paramIn.getString("row"));
String staffName = paramIn.getString("staffName");
+ //2绾у埆缁勭粐淇℃伅
+ if (paramIn.containsKey("orgLevel") && paramIn.getString("orgLevel").equals("2")) {
+ //榛樿鍙煡鐪嬪綋鍓嶅綊灞炵粍缁囨灦鏋�
+ BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
+ basePrivilegeDto.setResource("/viewAllOrganization");
+ basePrivilegeDto.setUserId(pd.getUserId());
+ List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
+ if (privileges.size() == 0) {
+ //鏌ヨ鍛樺伐鎵�灞炰簩绾х粍缁囨灦鏋�
+ OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+ orgStaffRelDto.setStaffId(pd.getUserId());
+ List<OrgStaffRelDto> orgStaffRelDtos = iOrgStaffRelInnerServiceSMO.queryOrgInfoByStaffIds(orgStaffRelDto);
+ if (orgStaffRelDtos.size() > 0) {
+ paramIn.put("branchOrgId", orgStaffRelDtos.get(0).getCompanyId());//褰撳墠浜鸿櫧褰掑睘鐨勪簩绾х粍缁囦俊鎭�
+ paramIn.put("parentOrgId", orgStaffRelDtos.get(0).getCompanyId());//褰撳墠浜鸿櫧褰掑睘鐨勪簩绾х粍缁囦俊鎭�
+ }
+
+ }
+ }
if (rows > 50) {
return new ResponseEntity<String>("rows 鏁伴噺涓嶈兘澶т簬50", HttpStatus.BAD_REQUEST);
--
Gitblit v1.8.0