fix transflow clientIds

master
luoyang 5 years ago
parent dd5b00a097
commit 6bd1effa06

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>1.3.42</version>
<version>1.3.43</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>

@ -730,7 +730,7 @@ public class TradeLogServiceImpl implements TradeLogService {
public void exportExcel(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception {
logger.debug("excel The method======= exportExcel() start.......................");
JSONObject transFlow = listPartnerTransFlow(query, partner);
JSONObject client = clientManager.getClientInfo(Integer.parseInt(query.getClient_ids()[0]));
JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
if (!transFlow.getJSONArray("data").isEmpty()) {
try {
List<JSONObject> dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class);
@ -815,7 +815,7 @@ public class TradeLogServiceImpl implements TradeLogService {
public void exportExcelNew(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception {
logger.debug("excel The method======= exportExcelNew() start.......................");
JSONObject transFlow = listPartnerTransFlow(query, partner);
JSONObject client = clientManager.getClientInfo(Integer.parseInt(query.getClient_ids()[0]));
JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
if (!transFlow.getJSONArray("data").isEmpty()) {
List<JSONObject> dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class);
try (HSSFWorkbook workbook = new HSSFWorkbook()) {

@ -22,7 +22,6 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.order_device_isAll = true;
$scope.params.trans_type = 0;
$scope.isAll = true;
$scope.clientIds = [$scope.currentUser.client.client_id];
$scope.clients = [$scope.currentUser.client];
$scope.params.client_ids = [$scope.currentUser.client.client_id];
$scope.showLevel3Clients = false;

Loading…
Cancel
Save