bug

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -3202,7 +3202,7 @@ public class InformationWriteQueryController extends BladeController {
             @ApiImplicitParam(name = "contractId", value = "合同段ID", required = true)
     })
     public R<IPage<InformationQueryVO>> page(@RequestBody InformationQueryVO vo) {
-        if ("null".equals(String.valueOf(vo.getContractId())) || StringUtils.isEmpty(String.valueOf(vo.getContractId()))) {
+        if (ObjectUtil.isEmpty(vo.getContractId())) {
             return R.data(-1, null, "数据查询失败");
         }
         //封装分页信息

blade-service/blade-control/src/main/java/org/springblade/control/controller/ExMaTwoController.java

@@ -8,6 +8,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springblade.business.vo.TrialContainerClassificationVO;
 import org.springblade.control.entity.*;
 import org.springblade.control.service.impl.ContractReturnedInfoServiceImpl;
 import org.springblade.control.service.impl.EMLoanServiceImpl;
@@ -229,4 +230,37 @@ public class ExMaTwoController extends BladeController {
         return R.data(null);
     }
 
+    @GetMapping("/getApprovesList")
+    @ApiOperationSupport(order = 9)
+    @ApiOperation(value = "获取审批人列表")
+    public R<Map<String, Map<String, List<String>>>> getApprovesList() {
+        Map<String, Map<String, List<String>>> result = new LinkedHashMap<>();
+        List<TaskProcessRecordDictInfo> query = jdbcTemplate.query("select dict_id,role_name,sort,type from c_task_process_record_dict_info", new BeanPropertyRowMapper<>(TaskProcessRecordDictInfo.class));
+        Map<Long, List<TaskProcessRecordDictInfo>> collect = query.stream().collect(Collectors.groupingBy(TaskProcessRecordDictInfo::getDictId));
+        for (Map.Entry<Long, List<TaskProcessRecordDictInfo>> longListEntry : collect.entrySet()) {
+            DictInfo dictInfo = jdbcTemplate.query("select dict_name from c_dict_info where is_deleted = 0 and type = 6 and id = " + longListEntry.getKey(), new BeanPropertyRowMapper<>(DictInfo.class)).stream().findAny().orElse(null);
+            if (dictInfo != null) {
+                List<String> spRoleInfo = longListEntry.getValue()
+                        .stream()
+                        .filter(info -> info.getType() == 1)
+                        .sorted(Comparator.comparing(TaskProcessRecordDictInfo::getSort))
+                        .map(TaskProcessRecordDictInfo::getRoleName)
+                        .collect(Collectors.toList());
+
+                List<String> zcRoleInfo = longListEntry.getValue()
+                        .stream()
+                        .filter(info -> info.getType() == 2)
+                        .sorted(Comparator.comparing(TaskProcessRecordDictInfo::getSort))
+                        .map(TaskProcessRecordDictInfo::getRoleName)
+                        .collect(Collectors.toList());
+
+                Map<String, List<String>> map = new LinkedHashMap<>();
+                map.put("审批人", spRoleInfo);
+                map.put("抄送人", zcRoleInfo);
+                result.put(dictInfo.getDictName(), map);
+            }
+        }
+        return R.data(result);
+    }
+
 }