Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-06-01 b497ff41e47f4ebe69b86f13f6972f34f33f4884

 service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java

old mode 100644
new mode 100755
@@ -344,11 +344,11 @@
        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);
        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);

        ResultVo resultVo = getCommunityStoreInfoSMOImpl.getUserPrivileges(pd, privilegeInfoObj.getString("staffId"), storeInfoObj.getString("storeTypeCd"), restTemplate);
        ResponseEntity<String> privilegeGroup = new ResponseEntity<>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
//        ResultVo resultVo = getCommunityStoreInfoSMOImpl.getUserPrivileges(pd, privilegeInfoObj.getString("staffId"), storeInfoObj.getString("storeTypeCd"), restTemplate);
//        ResponseEntity<String> privilegeGroup = new ResponseEntity<>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
        if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
            return privilegeGroup;
        }