集成中台及正联功能

Pu Zhibing

9 天以前 f2530067b6cd16a87b76190cf524d2ed75bf9592

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
@@ -52,6 +53,9 @@

    @Autowired
    private IDriverActivityHistoryService driverActivityHistoryService;

    @Autowired
    private ShiroExtUtil shiroExtUtil;

    /**
     * 跳转到首页
@@ -229,7 +233,7 @@
    @RequestMapping(value = "/list")
    @ResponseBody
    public Object list(String createTime,String name) {
        ShiroUser user = ShiroKit.getUser();
        ShiroUser user = shiroExtUtil.getUser();
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(createTime)){