|
@@ -98,9 +98,8 @@ public class ProjectController {
|
|
result.put("msg", "未查询到数据!");
|
|
result.put("msg", "未查询到数据!");
|
|
}
|
|
}
|
|
Map data = new HashMap();
|
|
Map data = new HashMap();
|
|
-
|
|
|
|
data.put("datalist", projectManagementByState);
|
|
data.put("datalist", projectManagementByState);
|
|
- return MessageResult.success().add("data", data);
|
|
|
|
|
|
+ return MessageResult.success().add("data", projectManagementByState);
|
|
//return MessageResult.success().add("dataList", projectManagementByState);
|
|
//return MessageResult.success().add("dataList", projectManagementByState);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -119,7 +118,7 @@ public class ProjectController {
|
|
List<Map<String, String>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
|
|
List<Map<String, String>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
|
|
Map data = new HashMap();
|
|
Map data = new HashMap();
|
|
data.put("datalist", memberManagementcoll);
|
|
data.put("datalist", memberManagementcoll);
|
|
- return MessageResult.success().add("data", data);
|
|
|
|
|
|
+ return MessageResult.success().add("data", memberManagementcoll);
|
|
//return MessageResult.success().add("dataList", memberManagementcoll);
|
|
//return MessageResult.success().add("dataList", memberManagementcoll);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -208,7 +207,7 @@ public class ProjectController {
|
|
List<Map<String, String>> personAll = projectPersonService.getPersonAll();
|
|
List<Map<String, String>> personAll = projectPersonService.getPersonAll();
|
|
Map data = new HashMap();
|
|
Map data = new HashMap();
|
|
data.put("datalist", personAll);
|
|
data.put("datalist", personAll);
|
|
- return MessageResult.success().add("data", data);
|
|
|
|
|
|
+ return MessageResult.success().add("data", personAll);
|
|
//return MessageResult.success().add("dataList", personAll);
|
|
//return MessageResult.success().add("dataList", personAll);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -236,7 +235,7 @@ public class ProjectController {
|
|
//}
|
|
//}
|
|
Map data = new HashMap();
|
|
Map data = new HashMap();
|
|
data.put("datalist", projectPersonColl);
|
|
data.put("datalist", projectPersonColl);
|
|
- return MessageResult.success().add("data", data);
|
|
|
|
|
|
+ return MessageResult.success().add("data", projectPersonColl);
|
|
//return MessageResult.success().add("dataList", data);
|
|
//return MessageResult.success().add("dataList", data);
|
|
}
|
|
}
|
|
|
|
|