From b08ff35fe5cce3ade0e8f0b1749e0571be1b2fd8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 15 二月 2020 23:41:51 +0800
Subject: [PATCH] 优化员工邮箱不需要必填问题
---
WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java
index a3e81ef..4b33432 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.util.Assert;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
import com.java110.core.context.IPageData;
-import com.java110.web.core.BaseComponentSMO;
+import com.java110.core.component.BaseComponentSMO;
import com.java110.web.smo.IPrivilegeServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
@@ -70,9 +70,10 @@
Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","璇锋眰鎶ユ枃涓湭鍖呭惈pgId 鑺傜偣");
String pgId = privilegeInfoObj.getString("pgId");
+ String name = privilegeInfoObj.getString("name");
ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,"",
- ServiceConstant.SERVICE_API_URL+"/api/query.privilege.byPgId?pgId="+pgId , HttpMethod.GET);
+ ServiceConstant.SERVICE_API_URL+"/api/query.privilege.byPgId?pgId="+pgId+"&name="+name , HttpMethod.GET);
if(privilegeGroup.getStatusCode() != HttpStatus.OK){
return privilegeGroup;
}
@@ -243,6 +244,44 @@
return privilegeGroup;
}
+ /**
+ *
+ * @param pd
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> listStaffPrivileges(IPageData pd) {
+ Assert.hasLength(pd.getUserId(),"鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
+
+ JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
+ Assert.jsonObjectHaveKey(privilegeInfoObj,"staffId","璇锋眰鎶ユ枃涓湭鍖呭惈鍛樺伐ID 鑺傜偣");
+
+ ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+
+ if(storeInfo.getStatusCode() != HttpStatus.OK){
+ return storeInfo;
+ }
+ // 鍟嗘埛杩斿洖淇℃伅
+ JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
+
+ String storeId = storeInfoObj.getString("storeId");
+ privilegeInfoObj.put("storeId",storeId);
+
+ ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,"",
+ ServiceConstant.SERVICE_API_URL+"/api/query.user.privilege?userId="+privilegeInfoObj.getString("staffId")+"&domain="+storeInfoObj.getString("storeTypeCd") , HttpMethod.GET);
+ if(privilegeGroup.getStatusCode() != HttpStatus.OK){
+ return privilegeGroup;
+ }
+ JSONObject resultObj = JSONObject.parseObject(privilegeGroup.getBody().toString());
+
+ JSONArray privileges = resultObj.getJSONArray("privileges");
+
+ JSONObject resObj = new JSONObject();
+ resObj.put("datas",privileges);
+
+ return new ResponseEntity<String>(resObj.toJSONString(),HttpStatus.OK);
+ }
+
public RestTemplate getRestTemplate() {
return restTemplate;
}
--
Gitblit v1.8.0