|
@@ -12,6 +12,7 @@ import com.uas.platform.b2b.temporary.model.MessageModel;
|
|
|
import com.uas.platform.core.model.PageParams;
|
|
import com.uas.platform.core.model.PageParams;
|
|
|
import com.uas.platform.core.util.HttpUtil;
|
|
import com.uas.platform.core.util.HttpUtil;
|
|
|
import com.uas.platform.core.util.serializer.FlexJsonUtils;
|
|
import com.uas.platform.core.util.serializer.FlexJsonUtils;
|
|
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.http.HttpStatus;
|
|
import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.ui.ModelMap;
|
|
import org.springframework.ui.ModelMap;
|
|
|
|
|
|
|
@@ -47,6 +48,7 @@ public class MessageUtils {
|
|
|
// params.put("pageParams", FlexJsonUtils.toJsonDeep(pageParams));
|
|
// params.put("pageParams", FlexJsonUtils.toJsonDeep(pageParams));
|
|
|
params.put("page", pageParams.getPage());
|
|
params.put("page", pageParams.getPage());
|
|
|
params.put("count", pageParams.getCount());
|
|
params.put("count", pageParams.getCount());
|
|
|
|
|
+ params.put("sorting", pageParams.getSorting());
|
|
|
params.put("isRead", isRead);
|
|
params.put("isRead", isRead);
|
|
|
if (null != keyword && !"".equals(keyword)) {
|
|
if (null != keyword && !"".equals(keyword)) {
|
|
|
params.put("keyword", keyword);
|
|
params.put("keyword", keyword);
|
|
@@ -98,8 +100,7 @@ public class MessageUtils {
|
|
|
*/
|
|
*/
|
|
|
public static ModelMap setReadByBatch(List<Long> ids) throws Exception {
|
|
public static ModelMap setReadByBatch(List<Long> ids) throws Exception {
|
|
|
ModelMap map = new ModelMap();
|
|
ModelMap map = new ModelMap();
|
|
|
- String idString = ids.toString().replace("[", "");
|
|
|
|
|
- idString = idString.replace("]", "");
|
|
|
|
|
|
|
+ String idString = StringUtils.join(ids, ",");
|
|
|
HashMap<String, Object> params = new HashMap<>();
|
|
HashMap<String, Object> params = new HashMap<>();
|
|
|
params.put("receiverUu", SystemSession.getUser().getUserUU());
|
|
params.put("receiverUu", SystemSession.getUser().getUserUU());
|
|
|
params.put("receiverEnuu", SystemSession.getUser().getEnterprise().getUu());
|
|
params.put("receiverEnuu", SystemSession.getUser().getEnterprise().getUu());
|