ssoDao加限制

src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
 import java.util.List;
 
 /**
@@ -54,7 +56,7 @@ public class WorkbenchController extends BaseController {
 
     @RequestMapping("/getHighcharts")
     @ResponseBody
-    public JSONObject getHighcharts(WorkbenchBean bean){
+    public void getHighcharts(WorkbenchBean bean,HttpServletResponse response){
         JSONObject res = new JSONObject();
         try {
             User user = UserUtils.getUser();
@@ -81,10 +83,14 @@ public class WorkbenchController extends BaseController {
 
             res.put("startDate",bean.getStartDate());
             res.put("endDate",bean.getEndDate());
+            String jsonStr = res.toJSONString();
+            PrintWriter out = response.getWriter();
+            response.setContentType("application/json;charset=utf-8");
+            out.write(jsonStr.toString());
+            out.close();
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return res;
     }
 
     public WorkbenchBean getWorkbenchByUser(User user,WorkbenchBean bean){

src/main/resources/mappings/modules/front.sso/SsoDao.xml

@@ -9,6 +9,7 @@
             ct_bbtc_sys_user su
         WHERE
             su.login_name = #{username}
+            AND del_flag = '0'
     </select>
 
 </mapper>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp

@@ -65,17 +65,15 @@
                 path += "举报时间:${report.reportTime}</br>";
                 path += "所在城市:${report.reportCity}</br>";
                 path += "内容:${report.reportContent}</br>";
-                path += "附件:";
-                <%--var reportAttachmentList = ${supplementAttachmentList};--%>
-                <%--console.log(reportAttachmentList);--%>
-                <%--for (var i = 0;i < reportAttachmentList.length;i++){--%>
-                    <%--path += "&nbsp;&nbsp;&nbsp;&nbsp;"+reportAttachmentList[i].attachmentPath+"</br>";--%>
-                <%--}--%>
-                <%--path += "        <c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs">--%>
-                <%--path += "        ${vs.count}.<a href="${reportAttachment.attachmentPath}" target="_blank">${reportAttachment.attachmentName}</a><br>--%>
+                path += "附件:</br>";
+                $("#attachment1").find("[class='attachmentClass']").each(function(){
+                    var url = $(this).attr("href");
+                    path += url;
+                });
                 path += "举报人信息</br>";
                 path += "姓名:${report.reportPersonName}</br>";
-                path += "Email:${report.reportPersonTel}</br>";
+                path += "手机号:${report.reportPersonTel}</br>";
+                path += "Email:${report.reportPersonEmail}</br>";
                 var reportSource = "${report.reportSource}";
                 if (reportSource == "web"){
                     reportSource = "官网";
@@ -144,11 +142,20 @@
                     path += "被举报区域:"+ supplementArea +"</br>";
                     path += "被举报项目:${report.supplementProject}</br>";
                     path += "内容:${report.reportContent}</br>";
+                    path += "附件:</br>";
+                    $("#attachment2").find("[class='attachmentClass']").each(function(){
+                        var url = $(this).attr("href");
+                        path += url;
+                    });
                 }
                 if (reportStatus == "2"){
                     path += "处理结果</br>";
                     path += "处理人:${report.dealPersonName}</br>";
-                    path += "处理成果文件:${report.supplementCompany}</br>";
+                    path += "处理成果文件:</br>";
+                    $("#attachment3").find("[class='attachmentClass']").each(function(){
+                        var url = $(this).attr("href");
+                        path += url;
+                    });
                     var dealResult = "${report.dealResult}";
                     if (dealResult == "North China"){
                         dealResult = "华北区域公司";
@@ -207,10 +214,10 @@
 
         <form:hidden path="id"/>
         <sys:message content="${message}"/>
-        <div id="reportAttachment" style="display: none">
+        <div id="attachment1" style="display: none">
             <c:if test="${supplementAttachmentList ne null}">
                 <c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs">
-                    &nbsp;&nbsp;<a href="${reportAttachment.attachmentPath}" target="_blank">${reportAttachment.attachmentName}</a><br>
+                    &nbsp;&nbsp;<a href="${reportAttachment.attachmentPath}" class="attachmentClass" target="_blank">${reportAttachment.attachmentName}</a><br>
                 </c:forEach>
             </c:if>
         </div>
@@ -278,10 +285,10 @@
         </div>
         <div class="control-group">
             <label class="control-label">附件:</label>
-            <div id="fujian2" class="controls">
+            <div id="attachment2" class="controls">
                 <c:if test="${supplementAttachmentList ne null}">
                     <c:forEach items="${supplementAttachmentList}" var="supplementAttachment" varStatus="vs">
-                        &nbsp;&nbsp;<a href="${supplementAttachment.attachmentPath}" target="_blank">${supplementAttachment.attachmentName}</a><br>
+                        &nbsp;&nbsp;<a href="${supplementAttachment.attachmentPath}" class="attachmentClass" target="_blank">${supplementAttachment.attachmentName}</a><br>
                     </c:forEach>
                 </c:if>
                 <form:hidden id="nameFile" path="supplementAttachment" htmlEscape="false"
@@ -300,10 +307,10 @@
         </div>
         <div class="control-group">
             <label class="control-label">处理成果文件:</label>
-            <div id="dealAttachment" class="controls">
+            <div id="attachment3" class="controls">
                 <c:if test="${dealAttachmentList ne null}">
                     <c:forEach items="${dealAttachmentList}" var="dealAttachment" varStatus="vs">
-                        &nbsp;&nbsp;<a href="${dealAttachment.attachmentPath}" target="_blank">${dealAttachment.attachmentName}</a><br>
+                        &nbsp;&nbsp;<a href="${dealAttachment.attachmentPath}" class="attachmentClass" target="_blank">${dealAttachment.attachmentName}</a><br>
                     </c:forEach>
                 </c:if>
                 <form:hidden id="dealFile" path="dealAttachment" htmlEscape="false"