From d62ee4d9179e3b352b44f0d5528de3ac6286083d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 四月 2019 18:25:57 +0800
Subject: [PATCH] 员工权限开发
---
WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java
index 7b7235f..f931e6e 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.common.constant.ServiceConstant;
import com.java110.common.util.Assert;
+import com.java110.common.util.StringUtil;
import com.java110.core.context.IPageData;
import com.java110.web.core.BaseComponentSMO;
import com.java110.web.smo.IStaffServiceSMO;
@@ -72,6 +73,8 @@
Assert.isInteger(paramIn.getString("rows"),"rows涓嶆槸鏁板瓧");
int page = Integer.parseInt(paramIn.getString("page"));
int rows = Integer.parseInt(paramIn.getString("rows"));
+ String staffName = paramIn.getString("staffName");
+
if(rows>50){
return new ResponseEntity<String>("rows 鏁伴噺涓嶈兘澶т簬50",HttpStatus.BAD_REQUEST);
}
@@ -83,8 +86,13 @@
Assert.jsonObjectHaveKey(responseEntity.getBody().toString(),"storeId","鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
- responseEntity = this.callCenterService(restTemplate,pd,"",
- ServiceConstant.SERVICE_API_URL+"/api/query.staff.infos?rows="+rows+"&page="+page+"&storeId="+storeId, HttpMethod.GET);
+ if(StringUtil.isEmpty(staffName)) {
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/query.staff.infos?rows=" + rows + "&page=" + page + "&storeId=" + storeId, HttpMethod.GET);
+ }else {
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/query.staff.byName?rows=" + rows + "&page=" + page + "&storeId=" + storeId+"&name="+staffName, HttpMethod.GET);
+ }
if(responseEntity.getStatusCode() != HttpStatus.OK){
return responseEntity;
}
@@ -121,10 +129,17 @@
*/
@Override
public ResponseEntity<String> delete(IPageData pd) {
+ ResponseEntity<String> responseEntity = null;
Assert.jsonObjectHaveKey(pd.getReqData(),"userId","璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鐢ㄦ埛ID淇℃伅");
Assert.jsonObjectHaveKey(pd.getReqData(),"storeId","璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍟嗘埛ID淇℃伅");
-
- return null;
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ JSONObject newParam = new JSONObject();
+ newParam.put("userId",paramIn.getString("userId"));
+ newParam.put("storeId",paramIn.getString("storeId"));
+ //淇敼鐢ㄦ埛淇℃伅
+ responseEntity = this.callCenterService(restTemplate,pd,newParam.toJSONString(),
+ ServiceConstant.SERVICE_API_URL+"/api/user.staff.delete", HttpMethod.POST);
+ return responseEntity;
}
/**
--
Gitblit v1.8.0