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

sample-form-manager/src/main/java/com/mortals/xhx/common/key/Constant.java

@@ -26,4 +26,6 @@ public final class Constant {
 	/** 登录用户类型为客户 */
 	public final static int CUSTOMER_USER = 99;
 
+	public final static String PARAMS_BLANK_COUNT = "blank_count";
+
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.IUser;
@@ -12,6 +13,7 @@ import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.feign.base.IApiBaseManagerFeign;
 import com.mortals.xhx.feign.base.pdu.DeptPdu;
 import com.mortals.xhx.feign.base.pdu.SitePdu;
@@ -180,6 +182,8 @@ public class HomeController extends BaseJsonBodyController {
             model.put("message_info", busiDesc + "成功");
             Rest<com.mortals.xhx.common.pdu.site.SitePdu> info = siteFeign.info(homeQueryPdu.getSiteId());
             model.put("title", info.getData().getSiteName()); //标题
+            model.put("blankCount", GlobalSysInfo.getParamIntValue(Constant.PARAMS_BLANK_COUNT,20)); //空白样表数量
+
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {
             code = VALUE_RESULT_FAILURE;

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -246,4 +246,16 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         return Rest.ok(msg);
     }
 
+    @Override
+    protected void findAfter(MatterDatumEntity params, PageInfo pageInfo, Context context, List<MatterDatumEntity> list) throws AppException {
+        list.stream().forEach(entity->{
+            MatterEntity matterEntity = matterService.get(entity.getMatterId(), context);
+            if(!ObjectUtils.isEmpty(matterEntity)){
+                entity.setMatterNo(matterEntity.getMatterNo());
+                entity.setMatterName(matterEntity.getMatterName());
+            }
+        });
+        super.findAfter(params, pageInfo, context, list);
+    }
+
 }
\ No newline at end of file