Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseProjectController.java

@@ -121,7 +121,7 @@ public class EnterpriseProjectController {
 
     @ApiOperation(value = "招标计划项目类型（openApi）")
     @RequestMapping(value = "/bidPlanProjectType",method = RequestMethod.POST)
-    public TableDataInfo bidPlanProjectType(@RequestBody @Valid EnterpriseProjectBidPlanProjectTypeBody body) throws Exception {
+    public R bidPlanProjectType(@RequestBody @Valid EnterpriseProjectBidPlanProjectTypeBody body) throws Exception {
         return enterpriseProjectService.bidPlanProjectType(body);
     }
 

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

@@ -121,10 +121,10 @@ public class EnterpriseProjectService {
         return dskOpenApiUtil.responsePage(map);
     }
 
-    public TableDataInfo bidPlanProjectType(EnterpriseProjectBidPlanProjectTypeBody body) throws Exception {
-        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
+    public R bidPlanProjectType(EnterpriseProjectBidPlanProjectTypeBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok(new ArrayList<>());
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanProjectType", BeanUtil.beanToMap(body, false, false));
-        return dskOpenApiUtil.responsePage(map);
+        return BeanUtil.toBean(map, R.class);
     }