diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
index 3e0ed24c..a21280cd 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
@@ -44,10 +44,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
/**
*
@@ -197,38 +194,19 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
}
//根据提单人id查询其部门名称
ResponseResult responseResult = hrmsFeignService.getAccountAndDeptNameById(arr);
- List employeeMessage = null;
+ List employeeMessage = null;
if(responseResult.getData() != null){
- employeeMessage = (List) responseResult.getData();
+ employeeMessage = (List) responseResult.getData();
}
- System.out.println("employeeMessage============"+employeeMessage);
- List empList = new ArrayList<>();
- for (EmployeeMessageResponse resq : employeeMessage) {
- empList.add(resq.getId().toString());
- }
-
- /* List strList = new ArrayList<>();
- String temp = null;
- for (int n=0; n employeelist = JSONObject.parseArray(employeeMessage,EmployeeMessageResponse.class);
-/* for (BusinessApplicationListResponse response:list) {
- for(EmployeeMessageResponse res : employeelist){
- if(response.getPresenterId().equals(res.getId())){//如果提单人id相同情况下,就往对象里面赋值
- response.setAccount(res.getAccount());
- response.setDeptName(res.getDeptName());
+ for (BusinessApplicationListResponse response:list) {
+ for(LinkedHashMap res : employeeMessage){
+ if(response.getPresenterId().equals(res.get("id"))){//如果提单人id相同情况下,就往对象里面赋值
+ response.setAccount(JSONObject.toJSONString(res.get("account")));
+ response.setDeptName(JSONObject.toJSONString(res.get("deptName")));
}
}
- // i++;
- }*/
+ }
}
}
return new ResponseResult().SUCCESS(data);