u

dsk-system/src/main/java/com/dsk/system/domain/dsk/dto/JskCombineCertificateDto.java

@@ -20,6 +20,10 @@ public class JskCombineCertificateDto implements Serializable {
      */
     @NotNull(message = "id不能为空！")
     private Long id;
+    /**
+     * 企业名称
+     */
+    private String companyName;
 
     /**
      * 页码

dsk-system/src/main/java/com/dsk/system/dskService/JskCombineInfoService.java

@@ -37,17 +37,17 @@ public class JskCombineInfoService {
 
     public TableDataInfo memberList(JskCombineSearchDto dto) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/memberList", BeanUtil.beanToMap(dto, false, false));
-        if (!ObjectUtils.isEmpty(map.get("data"))) {
-            Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
-            if (!ObjectUtils.isEmpty(data.get("list"))) {
-                List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
-                list.parallelStream().forEach(res -> {
-                    Integer companyId = MapUtils.getInteger(res, "companyId");
-                    String companyName = MapUtils.getString(res, "companyName");
-                    res.put("uipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(companyName, companyId));
-                });
-            }
-        }
+//        if (!ObjectUtils.isEmpty(map.get("data"))) {
+//            Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
+//            if (!ObjectUtils.isEmpty(data.get("list"))) {
+//                List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+//                list.parallelStream().forEach(res -> {
+//                    Integer companyId = MapUtils.getInteger(res, "companyId");
+//                    String companyName = MapUtils.getString(res, "companyName");
+//                    res.put("uipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(companyName, companyId));
+//                });
+//            }
+//        }
         return dskOpenApiUtil.responsePage(map);
     }
 
@@ -83,17 +83,17 @@ public class JskCombineInfoService {
 
     public TableDataInfo menberCertificateList(JskCombineCertificateDto dto)throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/member/certificateList", BeanUtil.beanToMap(dto, false, false));
-        if (!ObjectUtils.isEmpty(map.get("data"))) {
-            Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
-            if (!ObjectUtils.isEmpty(data.get("list"))) {
-                List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
-                list.parallelStream().forEach(res -> {
-                    Integer companyId = MapUtils.getInteger(res, "companyId");
-                    String companyName = MapUtils.getString(res, "companyName");
-                    res.put("uipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(companyName, companyId));
-                });
-            }
-        }
+//        if (!ObjectUtils.isEmpty(map.get("data"))) {
+//            Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
+//            if (!ObjectUtils.isEmpty(data.get("list"))) {
+//                List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+//                list.parallelStream().forEach(res -> {
+//                    Integer companyId = MapUtils.getInteger(res, "companyId");
+//                    String companyName = MapUtils.getString(res, "companyName");
+//                    res.put("uipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(companyName, companyId));
+//                });
+//            }
+//        }
         return dskOpenApiUtil.responsePage(map);
     }