|
@@ -104,7 +104,7 @@ public class OrganizationEvaluationInfoController {
|
|
|
@RequestParam(value = "indicatorId", required = false) String indicatorId,
|
|
|
@RequestParam(value = "binSection", required = false) String binSection,
|
|
|
@RequestParam(value = "binStage", required = false) String binStage) {
|
|
|
- /* LambdaQueryWrapper<OrganizationEvaluation> qw = new LambdaQueryWrapper<>();
|
|
|
+ LambdaQueryWrapper<OrganizationEvaluation> qw = new LambdaQueryWrapper<>();
|
|
|
qw.eq(OrganizationEvaluation::getId, organizationEvaluationId);
|
|
|
List<OrganizationEvaluation> orgEva = organizationEvaluationService.list(qw);
|
|
|
StringBuilder sb = new StringBuilder();
|
|
@@ -123,16 +123,16 @@ public class OrganizationEvaluationInfoController {
|
|
|
HttpServletRequest request = Objects.requireNonNull(attributes).getRequest();
|
|
|
JSONObject json = postUserService.getSysUser(request.getHeader("code"), request.getHeader("Blade-Auth"), request);
|
|
|
MyuserResDTO user = JSONObject.parseObject(json.getJSONObject("data").toJSONString(), MyuserResDTO.class);
|
|
|
-*/
|
|
|
+
|
|
|
Map list = organizationEvaluationInfoService.getEvaluationInfoList(organizationEvaluationId, organizationShortName, indicatorId, binSection, binStage, request);
|
|
|
- /*List<Map> value2 = (List<Map>) list.get("value");
|
|
|
+ List<Map> value2 = (List<Map>) list.get("value");
|
|
|
String s = CacheContext.childCompanyId.get(user.getId());
|
|
|
if (s != null) {
|
|
|
Set<String> childList = CacheContext.getChildList(s, sb.toString());
|
|
|
List<Map> value1 = value2.stream().filter(a -> childList.contains(a.get("organizationId"))).collect(Collectors.toList());
|
|
|
list.put("value", value1);
|
|
|
}
|
|
|
-*/
|
|
|
+
|
|
|
return R.ok().data(list);
|
|
|
}
|
|
|
|