提交

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/BackConfigService.java

@@ -392,7 +392,7 @@ public class BackConfigService {
 
         List<Companys> cpls = CacheContext.cpls;
 
-        if(cpls.get(0).getChildren().size()>0) return cpls;
+        if(cpls.get(1).getChildren().size()>0) return cpls;
 
         List<Windpowerstation> wpls = CacheContext.wpls;
         List<Project> prols= CacheContext.prols;

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

@@ -18,6 +18,6 @@ public interface ICompanysService extends IService<Companys> {
 
  IPage<Companys> list(String id, String name, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize);
 
-    List<Companys> getCompanysByidAndRid(String id, String rid);
+    List<Companys> getCompanysByidAndRid(String id, String name);
 
 }

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

@@ -19,6 +19,6 @@ public interface IRegionService extends IService<Region> {
 
     IPage<Region> list(String id, String name, String companyid, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize);
 
-    List<Region> getReginBycode(String code);
+    List<Region> getReginBycode(String companyid);
 }
 

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

@@ -42,14 +42,14 @@ public class CompanysServiceImpl extends ServiceImpl<CompanysMapper, Companys> i
     }
 
     @Override
-    public List<Companys> getCompanysByidAndRid(String id, String rid) {
+    public List<Companys> getCompanysByidAndRid(String id, String name) {
 
         QueryWrapper<Companys> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)){
             qw.like("id",id);
         }
-        if (StringUtils.isNotEmpty(rid)){
-            qw.like("rid",rid);
+        if (StringUtils.isNotEmpty(name)){
+            qw.like("name",name);
         }
         List<Companys> list = baseMapper.selectList(qw);
         return list;

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

@@ -51,11 +51,11 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
     }
 
     @Override
-    public List<Region> getReginBycode(String code) {
+    public List<Region> getReginBycode(String companyid) {
 
         QueryWrapper<Region> qw = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(code)){
-            qw.eq("code",code);
+        if (StringUtils.isNotEmpty(companyid)){
+            qw.eq("companyid",companyid);
         }
 
         List<Region> list = baseMapper.selectList(qw);