提交

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/RegionController.java

@@ -4,6 +4,7 @@ package com.gyee.backconfig.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.Line;
 import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.service.auto.IRegionService;
 import com.gyee.common.model.StringUtils;
@@ -77,7 +78,8 @@ public class RegionController {
      * @param region
      * @return
      */
-    @PostMapping(value = "/region")
+    @PostMapping(value = "/save")
+    @CrossOrigin(origins = "*", maxAge = 3600)
     public R addAll(@RequestBody Region region){
 
         boolean b = regionService.saveOrUpdate(region);
@@ -90,7 +92,6 @@ public class RegionController {
     }
 
 
-
     /**
      * 批量删除
      * @param ids

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindpowerstationServiceImpl.java

@@ -42,8 +42,8 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
             qw.like("name",name);
         }
 
-        if (StringUtils.isNotEmpty(name)){
-            qw.eq("companyid",companyid);
+        if (StringUtils.isNotEmpty(companyid)){
+            qw.like("companyid",companyid);
         }
 
         Page<Windpowerstation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));