From 2eec49645834dd9d6f63a8871e24a2551b2b67d6 Mon Sep 17 00:00:00 2001 From: yuyang Date: Sun, 9 Oct 2022 14:22:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=BA=E7=AB=99=E8=B4=B9?= =?UTF-8?q?=E7=8E=87=E7=A7=9F=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/XhpcChargingStationApiController.java | 4 +- .../mapper/XhpcChargingStationMapper.java | 2 +- .../service/IXhpcChargingStationService.java | 2 +- .../XhpcChargingStationServiceImpl.java | 54 ++++++++++--------- .../mapper/XhpcChargingStationMapper.xml | 30 +++++++++-- .../resources/mapper/XhpcStatisticsMapper.xml | 2 +- .../controller/XhpcOperatorController.java | 2 + .../com/xhpc/user/domain/XhpcOperator.java | 9 ++++ .../resources/mapper/XhpcOperatorMapper.xml | 11 +++- 9 files changed, 80 insertions(+), 36 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/api/XhpcChargingStationApiController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/api/XhpcChargingStationApiController.java index f83a3878..f873b1a1 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/api/XhpcChargingStationApiController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/api/XhpcChargingStationApiController.java @@ -35,10 +35,10 @@ public class XhpcChargingStationApiController extends BaseController { */ //@PreAuthorize(hasPermi = "system:station:list") @GetMapping("/getWXList") - public TableDataInfo getWXList(String name, String serviceFacilities, Integer code, String longitude, String latitude) { + public TableDataInfo getWXList(String name, String serviceFacilities, Integer code, String longitude, String latitude,String tenantId) { startPage(); - List> list = xhpcChargingStationService.getWXList(name, serviceFacilities, code, longitude, latitude); + List> list = xhpcChargingStationService.getWXList(name, serviceFacilities, code, longitude, latitude,tenantId); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java index f82644e0..bd1d3219 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java @@ -124,7 +124,7 @@ public interface XhpcChargingStationMapper { * @param clientVisible 微信小程序是否可见 2可见 * @return */ - List> getWXList(@Param("name") String name, @Param("serviceFacilities") List serviceFacilities, @Param("code") Integer code, @Param("longitude") String longitude, @Param("latitude") String latitude, @Param("clientVisible") Integer clientVisible,@Param("date") String date); + List> getWXList(@Param("name") String name, @Param("serviceFacilities") List serviceFacilities, @Param("code") Integer code, @Param("longitude") String longitude, @Param("latitude") String latitude, @Param("clientVisible") Integer clientVisible,@Param("date") String date,@Param("tenantId")String tenantId); /** diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java index fac5b916..ecf4a82a 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java @@ -143,7 +143,7 @@ public interface IXhpcChargingStationService { * @param latitude 维度 * @return */ - List> getWXList(String name, String serviceFacilities, Integer code, String longitude, String latitude); + List> getWXList(String name, String serviceFacilities, Integer code, String longitude, String latitude,String tenantId); /** diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index 37e37095..03654410 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -452,12 +452,13 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc } } } - + String tenantId = loginUser.getTenantId(); //添加费率计费模型 XhpcRateModel xhpcRateModel = new XhpcRateModel(); BeanUtils.copyProperties(xhpcChargingStationDto, xhpcRateModel); xhpcRateModel.setCreateBy(userName); xhpcRateModel.setUpdateBy(userName); + xhpcRateModel.setTenantId(tenantId); int i = xhpcChargingStationMapper.insertXhpcRateModel(xhpcRateModel); if (i == 0) { return AjaxResult.error("1005", "费率计费模型添加失败"); @@ -468,6 +469,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc XhpcChargingStation xhpcChargingStation = new XhpcChargingStation(); BeanUtils.copyProperties(xhpcChargingStationDto, xhpcChargingStation); xhpcChargingStation.setRateModelId(rateModelId); + xhpcChargingStation.setTenantId(tenantId); int j = xhpcChargingStationMapper.insertxhpcChargingStation(xhpcChargingStation); if (j == 0) { return AjaxResult.error("1006", "电站基本信息添加失败"); @@ -500,6 +502,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc xhpcRate.setRateValue(xhpcRateDto.getId()); xhpcRate.setCreateBy(userName); xhpcRate.setUpdateBy(userName); + xhpcRate.setTenantId(tenantId); xhpcChargingStationMapper.insertXhpcRate(xhpcRate); map.put(xhpcRateDto.getId(), xhpcRate.getRateId()); }else{ @@ -565,15 +568,15 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName); + sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName,tenantId); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName,tenantId); if(!endTime.equals("24:00:00")) { if(rateValue ==null || "".equals(rateValue)){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName,tenantId); } }else{ if(k == 0){ @@ -582,9 +585,9 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName); + sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName,tenantId); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName,tenantId); }else if(k < list.size()-1){ String endTimeK = list.get(k - 1).getEndTime(); if (!endTimeK.equals(startTime)) { @@ -592,10 +595,10 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName,tenantId); } //并把本条数据也添加上 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName,tenantId); }else{ String endTimeK = list.get(k - 1).getEndTime(); if (!endTimeK.equals(startTime)) { @@ -604,17 +607,17 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc return AjaxResult.error("请填写默认时间段费率"); } //添加一条默认费率时段 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName,tenantId); } //并把本条数据也添加上 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName,tenantId); if (!endTime.equals("24:00:00")) { if(rateValue ==null || "".equals(rateValue)){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } //添加一条默认费率时段 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName,tenantId); } } } @@ -753,7 +756,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc return map; } - private int addXhpcRateTime(Long chargingStationId, Long rateModelId, Long defaultPeriodId, String startTime, String endTime, int sort, int type, String rateValue, String userName) { + private int addXhpcRateTime(Long chargingStationId, Long rateModelId, Long defaultPeriodId, String startTime, String endTime, int sort, int type, String rateValue, String userName,String tenantId) { XhpcRateTime xhpcRateTime = new XhpcRateTime(); xhpcRateTime.setChargingStationId(chargingStationId); @@ -769,12 +772,13 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc xhpcRateTime.setCreateTime(Calendar.getInstance().getTime()); xhpcRateTime.setCreateBy(userName); xhpcRateTime.setUpdateBy(userName); + xhpcRateTime.setTenantId(tenantId); xhpcChargingStationMapper.insertXhpcRateTime(xhpcRateTime); return sort++; } @Override - public List> getWXList(String name, String serviceFacilities, Integer code, String longitude, String latitude) { + public List> getWXList(String name, String serviceFacilities, Integer code, String longitude, String latitude,String tenantId) { if(null==longitude||"".equals(longitude)||null==latitude||"".equals(latitude)){ longitude="104.065861"; latitude="30.657401"; @@ -788,7 +792,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc stringList = Arrays.asList(split); } String date = DateUtil.formatTime(new Date()); - List> list = xhpcChargingStationMapper.getWXList(name, stringList, code, longitude, latitude, 2,date); + List> list = xhpcChargingStationMapper.getWXList(name, stringList, code, longitude, latitude, 2,date,tenantId); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { Map map = list.get(i); @@ -1055,7 +1059,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc public AjaxResult updateXhpcRateTime(HttpServletRequest request, XhpcChargingStationDto xhpcChargingStationDto) { LoginUser loginUser = logUserUtils.getLogUser(request); String userName = loginUser.getUsername(); - + String tenantId = loginUser.getTenantId(); //电站id不能为空 if (xhpcChargingStationDto.getChargingStationId() == null) { return AjaxResult.error("1001", "电站id为空"); @@ -1212,15 +1216,15 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName); + sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName,tenantId); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName,tenantId); if(!endTime.equals("24:00:00")) { if(rateValue ==null || "".equals(rateValue)){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName,tenantId); } }else{ if(k == 0){ @@ -1229,9 +1233,9 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName); + sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName,tenantId); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName,tenantId); }else if(k < list.size()-1){ String endTimeK = list.get(k - 1).getEndTime(); if (!endTimeK.equals(startTime)) { @@ -1239,10 +1243,10 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName,tenantId); } //并把本条数据也添加上 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName,tenantId); }else{ String endTimeK = list.get(k - 1).getEndTime(); if (!endTimeK.equals(startTime)) { @@ -1251,17 +1255,17 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc return AjaxResult.error("请填写默认时间段费率"); } //添加一条默认费率时段 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName,tenantId); } //并把本条数据也添加上 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName,tenantId); if (!endTime.equals("24:00:00")) { if(rateValue ==null || "".equals(rateValue)){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } //添加一条默认费率时段 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName,tenantId); } } } diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml index 16536b07..9690917e 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -323,6 +323,9 @@ and cs.area_code in (select code from xhpc_area where pcode=#{code}) or cs.area_code=#{code} + + and cs.tenant_id =#{tenantId} + ORDER BY distance asc @@ -434,7 +437,10 @@ update_by, - remark + remark, + + + tenant_id, @@ -457,7 +463,10 @@ #{updateBy}, - #{remark} + #{remark}, + + + #{tenantId}, @@ -555,6 +564,9 @@ installed_total_power, running_total_power, + + tenant_id, + @@ -646,6 +658,9 @@ #{installedTotalPower}, #{runningTotalPower}, + + #{tenantId}, + @@ -687,7 +702,10 @@ rate_value, - rate_model_id + rate_model_id, + + + tenant_id, @@ -728,9 +746,11 @@ #{rateValue}, - #{rateModelId} + #{rateModelId}, + + + #{tenantId}, - diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml index 9d457ba9..ec977c82 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml @@ -495,7 +495,7 @@ from xhpc_operator where del_flag =0 - and operator_id in (select operator_id from xhpc_charging_station where operator_id=#{userId}) + and operator_id=#{userId} and operator_id in (select operator_id from xhpc_charging_station where charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId})) diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java index 1d98f246..47425fa1 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java @@ -59,6 +59,7 @@ public class XhpcOperatorController extends BaseController { LoginUser loginUser = tokenService.getLoginUser(); xhpcOperator.setTenantId(loginUser.getTenantId()); + xhpcOperator.setCorpNo(xhpcOperator.getOperatorIdEvcs()); SysUser sysUser = new SysUser(); BigDecimal t3 =new BigDecimal(100); BigDecimal t4 =new BigDecimal(0); @@ -149,6 +150,7 @@ public class XhpcOperatorController extends BaseController { sysUser.setUserName(xhpcOperator.getPhone()); sysUser.setPassword("123456"); iXhpcUserService.updateUser(sysUser); + xhpcOperator.setCorpNo(xhpcOperator.getOperatorIdEvcs()); return toAjax(iXhpcOperatorService.update(xhpcOperator)); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcOperator.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcOperator.java index 4139eac8..cc6085e2 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcOperator.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcOperator.java @@ -18,6 +18,7 @@ public class XhpcOperator extends BaseEntity { */ private Long operatorId; + private String corpNo; /** * 名称 */ @@ -372,4 +373,12 @@ public class XhpcOperator extends BaseEntity { public void setRoleId(Long roleId) { this.roleId = roleId; } + + public String getCorpNo() { + return corpNo; + } + + public void setCorpNo(String corpNo) { + this.corpNo = corpNo; + } } diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml index 19897067..20e23c55 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml @@ -55,6 +55,9 @@ name, + + corp_no, + contact_name, @@ -144,6 +147,9 @@ #{name}, + + #{corpNo}, + #{contactName}, @@ -236,6 +242,7 @@ operator_id = #{operatorId}, name = #{name}, + corp_no = #{corpNo}, contact_name = #{contactName}, contact_phone = #{contactPhone}, phone = #{phone}, @@ -287,10 +294,12 @@ , xo.operator_id_evcs operatorIdEvcs, xdb.dict_value attributenName,`xa`.merger_name mergerName, + concat(0) roleId, xo.business_license_id businessLicenseUrl from xhpc_operator `xo` LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'operator_attribute' and xdb.dict_key = xo.attribute LEFT JOIN xhpc_area `xa` on `xa`.`code` = xo.area_code + where xo.del_flag = 0 and xo.operator_id = #{operatorId} @@ -325,7 +334,7 @@ and xo.operator_id =#{operatorId} - and xo.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{logOperatorId})) + and xo.operator_id=#{logOperatorId} and xo.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{logOperatorId}))