修改bug

Pu Zhibing

3 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9

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

@@ -2,23 +2,22 @@

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.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.TFeedback;
import com.stylefeng.guns.modular.system.model.TProblem;
import com.stylefeng.guns.modular.system.model.TSystemNotice;
import com.stylefeng.guns.modular.system.service.ITProblemService;
import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
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.TProblem;
import com.stylefeng.guns.modular.system.service.ITProblemService;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;

@@ -31,15 +30,18 @@
@Controller
@RequestMapping("/tProblem")
public class TProblemController extends BaseController {

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

    
    @Autowired
    private ITProblemService tProblemService;

    
    @Autowired
    private ITSystemNoticeService itSystemNoticeService;

    
    @Resource
    private ShiroExtUtil shiroExtUtil;
    
    /**
     * 跳转到用户留言管理首页
     */
@@ -47,7 +49,7 @@
    public String index() {
        return PREFIX + "tProblem.html";
    }

    
    /**
     * 跳转到查看详情
     */
@@ -83,16 +85,16 @@
                       Integer state) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
        if (SinataUtil.isNotEmpty(insertTime)) {
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            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(tProblemService.getProblemList(page,beginTime,endTime,userName,state));
        } else {
            page.setRecords(tProblemService.getProblemList(page, beginTime, endTime, userName, state));
        }
        return super.packForBT(page);
    }
@@ -104,18 +106,18 @@
    @ResponseBody
    public Object immediately(@RequestParam Integer tProblemId,@RequestParam String answer) {
        TProblem tProblem = tProblemService.selectById(tProblemId);
        if (SinataUtil.isNotEmpty(tProblem)){
        if (SinataUtil.isNotEmpty(tProblem)) {
            tProblem.setAnswer(answer);
            tProblem.setHandleTime(new Date());
            tProblem.setHandleUserId(ShiroKit.getUser().getId());
            tProblem.setHandleUserId(shiroExtUtil.getUser().getId());
            tProblem.setState(2);
            tProblemService.updateById(tProblem);

    
            //增加系统消息
            TSystemNotice notice = new TSystemNotice();
            notice.setType(2);
            notice.setUserType(1);
            notice.setContent("您的留言被回复啦:【"+answer+"】");
            notice.setContent("您的留言被回复啦:【" + answer + "】");
            notice.setUserId(tProblem.getUserId());
            notice.setInsertTime(new Date());
            notice.setRead(1);