修改bug

Pu Zhibing

3 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java

@@ -2,25 +2,25 @@

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.log.LogObjectHolder;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.TNotices;
import com.stylefeng.guns.modular.system.service.ITNoticesService;
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.task.base.QuartzManager;
import com.stylefeng.guns.modular.system.util.task.base.TimeJobType;
import com.stylefeng.guns.modular.system.util.task.jobs.AddNotice;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.TNotices;
import com.stylefeng.guns.modular.system.service.ITNoticesService;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -34,12 +34,16 @@
@Controller
@RequestMapping("/tNotices")
public class TNoticesController extends BaseController {

    
    private String PREFIX = "/system/tNotices/";

    
    @Autowired
    private ITNoticesService tNoticesService;

    
    @Resource
    private ShiroExtUtil shiroExtUtil;
    
    
    /**
     * 跳转到滚动消息设置首页
     */
@@ -47,7 +51,7 @@
    public String index() {
        return PREFIX + "tNotices.html";
    }

    
    /**
     * 跳转到系统公告设置首页
     */
@@ -108,10 +112,10 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroKit.getUser().getRoleType() != 1){
        if (shiroExtUtil.getUser().getRoleType() != 1) {
            page.setRecords(null);
        }else{
            page.setRecords(tNoticesService.getRollingNoticeList(page,beginTime,endTime,1,content));
        } else {
            page.setRecords(tNoticesService.getRollingNoticeList(page, beginTime, endTime, 1, content));
        }
        return super.packForBT(page);
    }
@@ -130,10 +134,10 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroKit.getUser().getRoleType() != 1){
        if (shiroExtUtil.getUser().getRoleType() != 1) {
            page.setRecords(null);
        }else{
            page.setRecords(tNoticesService.getRollingNoticeList(page,beginTime,endTime,2,content));
        } else {
            page.setRecords(tNoticesService.getRollingNoticeList(page, beginTime, endTime, 2, content));
        }
        return super.packForBT(page);
    }
@@ -146,7 +150,7 @@
    public Object add(TNotices tNotices) {
        tNotices.setIsDelete(1);
        tNotices.setInsertTime(new Date());
        tNotices.setInsertUser(ShiroKit.getUser().getId());
        tNotices.setInsertUser(shiroExtUtil.getUser().getId());
        tNotices.setType(1);
        tNoticesService.insert(tNotices);
        return SUCCESS_TIP;
@@ -160,7 +164,7 @@
    public Object addSystem(TNotices tNotices) {
        tNotices.setIsDelete(1);
        tNotices.setInsertTime(new Date());
        tNotices.setInsertUser(ShiroKit.getUser().getId());
        tNotices.setInsertUser(shiroExtUtil.getUser().getId());
        tNotices.setType(2);
        tNoticesService.insert(tNotices);

@@ -188,7 +192,7 @@
        }
        tNotices.setIsShow(1);
        tNotices.setUpdateTime(new Date());
        tNotices.setUpdateUser(ShiroKit.getUser().getId());
        tNotices.setUpdateUser(shiroExtUtil.getUser().getId());
        tNoticesService.updateById(tNotices);
        return SUCCESS_TIP;
    }
@@ -203,7 +207,7 @@
        tNotices.setIsDelete(2);
        tNotices.setFlag("3");
        tNotices.setUpdateTime(new Date());
        tNotices.setUpdateUser(ShiroKit.getUser().getId());
        tNotices.setUpdateUser(shiroExtUtil.getUser().getId());
        tNoticesService.updateById(tNotices);
        return SUCCESS_TIP;
    }
@@ -214,7 +218,7 @@
    @RequestMapping(value = "/update")
    @ResponseBody
    public Object update(TNotices tNotices) {
        tNotices.setUpdateUser(ShiroKit.getUser().getId());
        tNotices.setUpdateUser(shiroExtUtil.getUser().getId());
        tNotices.setUpdateTime(new Date());
        tNoticesService.updateById(tNotices);
        return SUCCESS_TIP;
@@ -226,7 +230,7 @@
    @RequestMapping(value = "/updateSystem")
    @ResponseBody
    public Object updateSystem(TNotices tNotices) {
        tNotices.setUpdateUser(ShiroKit.getUser().getId());
        tNotices.setUpdateUser(shiroExtUtil.getUser().getId());
        tNotices.setUpdateTime(new Date());
        tNoticesService.updateById(tNotices);