修改配置文件1

sample-form-manager/src/main/bin/deploy.sh

@@ -25,7 +25,7 @@ NGINX_CONF_PATH="/etc/nginx/conf.d/"
 NGINX_PORT="@profiles.nginx.port@"
 NGINX_SERVER_PATH="@profiles.server.path@"
 PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
-PROJECT_UI_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}-ui"
+PROJECT_UI_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}-ui/dist"
 PROJECT_FILENAME="${PROJECT_NAME}.tar.gz"
 PROJECT_UI_FILENAME="${PROJECT_NAME}-ui.tar.gz"
 PROJECT_SERVICE="${SERVICE_PATH}/${PROJECT_NAME}.service"
@@ -100,7 +100,7 @@ build_nginx() {
 
         #server_name localhost;
         location / {
-             root ${PROJECT_UI_EXECPATH}/dist;
+             root ${PROJECT_UI_EXECPATH};
              index index.html index.htm;
         }
 

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.matter.web;
 import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.common.code.YesNo;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
@@ -20,12 +21,10 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.service.MatterService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import static com.mortals.framework.ap.SysConstains.*;
@@ -54,13 +53,23 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(MatterEntity query, Map<String, Object> model, Context context) throws AppException {
+        List<OrderCol> orderColList = new ArrayList<>();
+        orderColList.add(new OrderCol("isRecommend"));
+        query.setOrderColList(orderColList);
+        super.doListBefore(query, model, context);
+    }
+
     @Override
     protected int doListAfter(MatterEntity query, Map<String, Object> model, Context context) throws AppException {
         int recommendCount = paramService.getParamIntValue(ParamKey.MATTER_RECOMMEND_COUNT);
         model.put("recommendCount", recommendCount);
-        return 1;
+        return super.doListAfter(query, model, context);
     }
 
+
+
     @RequestMapping(value = {"createMatter"},method = {RequestMethod.POST, RequestMethod.GET})
     public String createMatter(Long[] ids) {
         Context context = this.getContext();