Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceMatterDatumServiceImpl.java

 package com.mortals.xhx.module.device.service.impl;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.pdu.RespData;
@@ -23,7 +24,9 @@ import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
 import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
 import org.springframework.util.ObjectUtils;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -51,7 +54,10 @@ public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<Device
     protected void findAfter(DeviceMatterDatumEntity params, PageInfo pageInfo, Context context, List<DeviceMatterDatumEntity> list) throws AppException {
         //super.findAfter(params, pageInfo, context, list);
         list.forEach(item->{
-            List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
+            MatterDatumQuery matterDatumQuery = new MatterDatumQuery();
+            matterDatumQuery.setMatterId(item.getMatterId());
+            matterDatumQuery.setOrderColList(Arrays.asList(new OrderCol("isRecommend",OrderCol.DESCENDING)));
+            List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(matterDatumQuery);
             if(!ObjectUtils.isEmpty(matterDatumEntities)){
                 item.setMatterDatumList(matterDatumEntities);
             }else{

sample-form-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -278,8 +278,10 @@ public class HomeController extends BaseJsonBodyController {
                 List<DeviceMatterDatumEntity> matterEntities = matterDatumEntityList.stream().distinct().limit(5).collect(Collectors.toList());
                 model.put("hotMatterList", matterEntities); //热门事项
 
+
+                List<MatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().flatMap(item -> matterDatumService.find(new MatterDatumQuery().matterId(item.getId())).stream()).filter(f -> f.getIsRecommend() == 1).limit(5).collect(Collectors.toList());
                 //热门材料取5个
-                List<DeviceMatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().limit(5).collect(Collectors.toList());
+               // List<DeviceMatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().limit(5).collect(Collectors.toList());
                 model.put("hotDatumList", matterDatumEntities); //热门热门材料
             }