|
@@ -32,17 +32,19 @@ public class GyeeMatrixController extends BaseController{
|
|
|
{
|
|
|
if(keyid.equals("0"))
|
|
|
{
|
|
|
- Map<String,String> map=new HashMap<>();
|
|
|
+
|
|
|
for(Windpowerstation wp: InitialRunner.wpls)
|
|
|
{
|
|
|
+ Map<String,String> map=new HashMap<>();
|
|
|
map.put("id",wp.getId());
|
|
|
map.put("name",wp.getName());
|
|
|
ls.add(map);
|
|
|
}
|
|
|
}else {
|
|
|
- Map<String,String> map=new HashMap<>();
|
|
|
+
|
|
|
for(Project pj: InitialRunner.pjls)
|
|
|
{
|
|
|
+ Map<String,String> map=new HashMap<>();
|
|
|
if(pj.getWindpowerstationid().equals(keyid))
|
|
|
{
|
|
|
map.put("id",pj.getId());
|