Merge remote-tracking branch 'origin/master'

This commit is contained in:
cyk
2023-07-04 10:00:14 +08:00
2 changed files with 20 additions and 14 deletions

View File

@@ -16,8 +16,8 @@ public class commentService {
//显示所有评论
public String selectByProjectId(String id){
List<commentEntity> commentEntityList;
Map<String,String> dataMap = new HashMap<>();
Map<String,Map<String,String>> dataMap2 = new HashMap<>();
Map<String,Object> dataMap = new HashMap<>();
Map<String,Map<String,Object>> dataMap2 = new HashMap<>();
commentEntityList = commentDao.selectByProjectId(id);
for(int i=0;i<commentEntityList.size();i++)
{
@@ -32,8 +32,8 @@ public class commentService {
dataMap.put("username",username);
dataMap.put("time",time);
dataMap.put("content",content);
dataMap.put("star",String.valueOf(star));
dataMap.put("isUsed",String.valueOf(isUsed));
dataMap.put("star",star);
dataMap.put("isUsed",isUsed);
dataMap2.put(String.valueOf(i),dataMap);
}
return JSONArray.toJSONString(dataMap2);