Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/users/controllers/user_controller.js

@@ -143,7 +143,7 @@ class UserController extends BaseController {
         try {
             // 获取编办信息
             let compilationModel = new CompilationModel();
-            compilationList = await compilationModel.getList(request.headers.host);
+            compilationList = await compilationModel.getList(request.headers.host, false);
 
             // 获取当前用户信息
             let sessionUser = request.session.sessionUser;
@@ -194,7 +194,7 @@ class UserController extends BaseController {
 
             // 获取编办信息
             let compilationModel = new CompilationModel();
-            compilationList = await compilationModel.getList(request.headers.host);
+            compilationList = await compilationModel.getList(request.headers.host, false);
 
         } catch(error) {
             console.log(error);

modules/users/models/compilation_model.js

@@ -30,7 +30,7 @@ class CompilationModel extends BaseModel {
         // 筛选字段
         let field = fields == null ?{_id: 1, name: 1, is_release: 1, categoryID: 1, description: 1,overWriteUrl: 1,example: 1, "ration_valuation.id": 1, "ration_valuation.name": 1, "ration_valuation.enable": 1,
             "bill_valuation.id": 1, "bill_valuation.name": 1, "bill_valuation.enable": 1}:fields;
-        let compilationData = await this.findDataByCondition({name: {$ne: ''}}, field, false);
+        let compilationData = await this.findDataByCondition({name: {$nin: ['']}}, field, false);
 
         return compilationData === null ? [] : compilationData;
     }
@@ -40,22 +40,31 @@ class CompilationModel extends BaseModel {
      *
      * @return {Promise}
      */
-    async getList(host) {
+    async getList(host, name_filter = true) {
         // 筛选字段
         let field = {_id: 1, name: 1, is_release: 1, description: 1, categoryID: 1};
-        let compilationData = await this.findDataByCondition({name: {$ne: ''}, is_release: true}, field, false);
+        let compilationData = await this.findDataByCondition({name: {$ne: '' }, is_release: true}, field, false);
 
         compilationData === null ? [] : compilationData;
         // 川高养护特殊处理费用定额
         const cgCompilationNames = ['四川养护(2013)', '部颁2018计价标准'];
+        let flag = true;
         if (host) {
             if (/cgyh.smartcost.com.cn/.test(host)) {
                 compilationData = compilationData.filter(item => cgCompilationNames.includes(item.name));
+                flag = false;
             } else if (/yhyun.smartcost.com.cn/.test(host)) {
                 compilationData = compilationData.filter(item => !cgCompilationNames.includes(item.name));
+                flag = false;
             }
         }
-        return compilationData
+        if (name_filter && flag) {
+            compilationData = compilationData.filter(function (item) {
+                return cgCompilationNames.indexOf(item.name) === -1;
+            });
+        }
+
+        return compilationData;
     }
 
     /**