| 
					
				 | 
			
			
				@@ -74,14 +74,11 @@ public class imdialog extends Controller { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             row.put("latestnews", newmsgrows);//最新消息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            JSONArray timdialoguserArray = new JSONArray(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Rows timdialoguserRows = timdialoguserRowsMap.get(row.getString("timdialogid")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            for (Row timdialoguserRow : timdialoguserRows) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (timdialoguserRow.getLong("tenterprise_userid") != userid) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    timdialoguserArray.add(getHeadPic(timdialoguserRow.getLong("tenterprise_userid"))); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            for (Row user : timdialoguserRows) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                user.put("headportraiturl", getHeadPic(user.getLong("tenterprise_userid"))); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            row.put("headportraiturls", timdialoguserArray);//群成员头像 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            row.put("users", timdialoguserRows);//群成员头像 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return getSucReturnObject().setData(rows).saveToDataPool().toString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -271,7 +268,7 @@ public class imdialog extends Controller { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         long tenterprise_userid = content.getLong("tenterprise_userid"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String fimdialognotes = content.getString("fimdialognotes"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         int fisremove = content.getIntValue("fisremove"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        String status = dbConnect.runSqlUpdate("update timdialogusers set fisremove=" + fisremove + ",fimdialognotes='"+fimdialognotes+"' where siteid='" + siteid + "' and timdialogid='" + timdialogid + "' and tenterprise_userid='" + tenterprise_userid + "'"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        String status = dbConnect.runSqlUpdate("update timdialogusers set fisremove=" + fisremove + ",fimdialognotes='" + fimdialognotes + "' where siteid='" + siteid + "' and timdialogid='" + timdialogid + "' and tenterprise_userid='" + tenterprise_userid + "'"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ("true".equalsIgnoreCase(status)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return getSucReturnObject().toString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 |