code sync

modules/std_glj_lib/controllers/viewsController.js

@@ -5,6 +5,8 @@
 
 import BaseController from "../../common/base/base_controller";
 import mongoose from 'mongoose';
+import GljDao from '../models/gljModel';
+const gljDao = new GljDao();
 const compilationModel = mongoose.model('compilation');
 const stdGljLibModel = mongoose.model('std_glj_lib_map');
 let config = require("../../../config/config.js");
@@ -28,6 +30,8 @@ class ViewsController extends BaseController{
            let absoluteUrl = compilation.overWriteUrl ? req.app.locals.rootDir + compilation.overWriteUrl : req.app.locals.rootDir;
            overWriteUrl = fs.existsSync(absoluteUrl) && fs.statSync(absoluteUrl).isFile()? compilation.overWriteUrl : null;
         }
+        // await gljDao.copyLib(7,24); //UAT
+        // await gljDao.copyLib(7,25); //PROD
         res.render('maintain/std_glj_lib/html/gongliao.html',
         {
             userAccount: req.session.managerData.username,

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -1127,6 +1127,7 @@ let preHandleFilterObj = {
             for (let item of exposed_properties_arr[idx]) {
                 jdtlSel.append("<option value='" + item.Key + "'>" + item.Name + "</option>");
             }
+            node[JV.PROP_FILTER_COMPARE_OBJ_KEY] = sel.value;
         } else {
             //清除所有key选项
             node[JV.PROP_FILTER_COMPARE_OBJ_KEY] = null;