Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -8,6 +8,7 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -76,7 +77,6 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
     }
 
 
-
     /**
      * @param id
      * @param model
@@ -102,6 +102,12 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
     @Override
     protected void doListBefore(MatterDatumEntity query, Map<String, Object> model, Context context) throws AppException {
         MDC.put("startTime", String.valueOf(System.currentTimeMillis()));
+        if (ObjectUtils.isEmpty(query.getSize())) {
+            query.setSize(20);
+        }
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.getOrderColList().add(new OrderCol("id", OrderCol.DESCENDING));
+        }
         super.doListBefore(query, model, context);
     }
 
@@ -177,7 +183,7 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
             String code = obj.getString("code");
             String data = obj.getString("data");
             if ("0".equals(code)) {
-                return Rest.ok("获取附件链接成功！",data);
+                return Rest.ok("获取附件链接成功！", data);
             } else {
                 return Rest.fail("获取链接失败");
             }

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -530,6 +530,14 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             siteQuery.setSiteName(query.getSiteName());
         }
         List<SiteEntity> siteEntityList = this.find(siteQuery);
+        //去除部分敏感信息；
+
+        for (SiteEntity siteEntity : siteEntityList) {
+            siteEntity.setLeadingOfficial("****");
+            siteEntity.setLeadingOfficialTelephone("****");
+            siteEntity.setSiteIp("****");
+        }
+
         siteAreaVo.setSiteList(siteEntityList);
         list.add(siteAreaVo);
         //两层结构{xxx:[{sitename:xxx},{}...],bbb:[{sitename:xxx},{}...]}