修改八阿哥

minkai95 · May 8, 2018 · 20c76af · 20c76af
1 parent 450beb0
commit 20c76af
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 16 deletions.
diff --git a/src/main/java/com/snut_tdms/controller/UserController.java b/src/main/java/com/snut_tdms/controller/UserController.java
@@ -233,7 +233,7 @@ public JSONObject uploadFile(HttpServletRequest request,HttpSession httpSession)
         String b = request.getParameter("description");
         String c = request.getParameter("typeContentStr");
         if (request.getParameter("fileType")==null){
-            List<DataClass> list = userService.selectDataClass(userInfo.getDepartment().getCode(),null,"(2)",null);
+            List<DataClass> list = userService.selectDataClass(null,null,"(2)",null);
             request.setAttribute("fileType",list.get(0).getId());
         }else {
             request.setAttribute("fileType",request.getParameter("fileType"));

diff --git a/src/main/java/com/snut_tdms/service/AdminService.java b/src/main/java/com/snut_tdms/service/AdminService.java
@@ -426,7 +426,17 @@ public boolean backupsDataBase(String departmentCode, String backupsType){
             }
         }
         String rootPath = AdminService.class.getResource("").getPath();
-        rootPath = rootPath.substring(1,25);
+        rootPath = rootPath.substring(1,rootPath.length());
+        int cot = 0;
+        for(int i =0;i<rootPath.length();i++){
+            if ('/' == rootPath.toCharArray()[i]){
+                if(++cot==4){
+                    cot = i;
+                    break;
+                }
+            }
+        }
+        rootPath = rootPath.substring(0,cot);
         return ExcelUtilPOI.createExcel(rootPath,departmentCode,backupsType,"xls",titles,content);
     }
 

diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
@@ -270,7 +270,10 @@
           LEFT JOIN role ON data_class.role = role.id
           LEFT JOIN `user` ON data_class.`user` = `user`.username
           LEFT JOIN department ON data_class.department = department.code
-        WHERE department.code = #{departmentCode}
+        WHERE 1=1
+        <if test="department!=null and department!=''">
+            AND department.code = #{departmentCode}
+        </if>
         <if test="flag != null and flag!= ''">
             AND data_class.flag in ${flag}
         </if>

diff --git a/src/main/webapp/WEB-INF/jsp/admin/typeManageDeanOffice.jsp b/src/main/webapp/WEB-INF/jsp/admin/typeManageDeanOffice.jsp
@@ -60,7 +60,7 @@
                         </div>
                         <div class="form-group">
                             <label>类目属性:</label>
-                            <a id="addProperty" class="btn btn-success btn-sm" href="javascript: void(0);" style="margin-left: -30px;">添加属性</a>
+                            <a id="addProperty" class="btn btn-success btn-sm" href="javascript: void(0);" style="margin-left: 5px;">添加属性</a>
                             <a id="removeProperty" class="btn btn-warning btn-sm" href="javascript: void(0);">删除属性</a>
                             <div id="selectProperty" class="form-group"></div>
                         </div>

diff --git a/src/main/webapp/WEB-INF/jsp/admin/typeManageStudentOffice.jsp b/src/main/webapp/WEB-INF/jsp/admin/typeManageStudentOffice.jsp
@@ -60,7 +60,7 @@
                     </div>
                     <div class="form-group">
                         <label>类目属性:</label>
-                        <a id="addProperty" class="btn btn-success btn-sm" href="javascript: void(0);" style="margin-left: -30px;">添加属性</a>
+                        <a id="addProperty" class="btn btn-success btn-sm" href="javascript: void(0);" style="margin-left: 5px;">添加属性</a>
                         <a id="removeProperty" class="btn btn-warning btn-sm" href="javascript: void(0);">删除属性</a>
                         <div id="selectProperty" class="form-group">
 

diff --git a/src/main/webapp/WEB-INF/jsp/admin/typeManageTeacher.jsp b/src/main/webapp/WEB-INF/jsp/admin/typeManageTeacher.jsp
@@ -60,7 +60,7 @@
                     </div>
                     <div class="form-group">
                         <label>类目属性:</label>
-                        <a id="addProperty" class="btn btn-success btn-sm" href="javascript: void(0);" style="margin-left: -30px;">添加属性</a>
+                        <a id="addProperty" class="btn btn-success btn-sm" href="javascript: void(0);" style="margin-left: 5px;">添加属性</a>
                         <a id="removeProperty" class="btn btn-warning btn-sm" href="javascript: void(0);">删除属性</a>
                         <div id="selectProperty" class="form-group">
 

diff --git a/src/main/webapp/WEB-INF/jsp/deanOffice/deanApplyDataClass.jsp b/src/main/webapp/WEB-INF/jsp/deanOffice/deanApplyDataClass.jsp
@@ -84,7 +84,7 @@
                     </div>
                     <div class="form-group">
                         <label>类目属性:</label>
-                        <a id="addProperty" class="btn btn-success btn-sm" href="javascript:void(0);" style="margin-left: -30px;">添加属性</a>
+                        <a id="addProperty" class="btn btn-success btn-sm" href="javascript:void(0);" style="margin-left: 5px;">添加属性</a>
                         <a id="removeProperty" class="btn btn-warning btn-sm" href="javascript:void(0);">删除属性</a>
                         <div id="selectProperty" class="form-group"></div>
                     </div>

diff --git a/src/main/webapp/WEB-INF/jsp/deanOffice/deanOfficePersonData.jsp b/src/main/webapp/WEB-INF/jsp/deanOffice/deanOfficePersonData.jsp
@@ -80,7 +80,9 @@
     </div>
 </div>
 <div class="spin"></div>
-<div id="mb"></div>
+<div id="mb">
+    <p class="spinText">首次加载时间较长，请耐心等待...</p>
+</div>
 <script>
     // 打开文件
     function openFile(id) {

diff --git a/src/main/webapp/WEB-INF/jsp/deanOffice/deanOfficePublicData.jsp b/src/main/webapp/WEB-INF/jsp/deanOffice/deanOfficePublicData.jsp
@@ -106,7 +106,9 @@
     </div>
 </div>
 <div class="spin"></div>
-<div id="mb"></div>
+<div id="mb">
+    <p class="spinText">首次加载时间较长，请耐心等待...</p>
+</div>
 <script>
     // 打开文件
     function openFile(id) {

diff --git a/src/main/webapp/WEB-INF/jsp/deanOffice/teachersPublicData.jsp b/src/main/webapp/WEB-INF/jsp/deanOffice/teachersPublicData.jsp
@@ -69,7 +69,9 @@
     </form>
 </div>
 <div class="spin"></div>
-<div id="mb"></div>
+<div id="mb">
+    <p class="spinText">首次加载时间较长，请耐心等待...</p>
+</div>
 <script>
     // 打开文件
     function openFile(id) {

diff --git a/src/main/webapp/WEB-INF/jsp/studentOffice/applyAddDataClass.jsp b/src/main/webapp/WEB-INF/jsp/studentOffice/applyAddDataClass.jsp
@@ -84,7 +84,7 @@
                     </div>
                     <div class="form-group">
                         <label>类目属性:</label>
-                        <a id="addProperty" class="btn btn-success btn-sm" href="javascript: void(0);" style="margin-left: -30px;">添加属性</a>
+                        <a id="addProperty" class="btn btn-success btn-sm" href="javascript: void(0);" style="margin-left: 5px;">添加属性</a>
                         <a id="removeProperty" class="btn btn-warning btn-sm" href="javascript: void(0);">删除属性</a>
                         <div id="selectProperty" class="form-group"></div>
                     </div>

diff --git a/src/main/webapp/WEB-INF/jsp/studentOffice/studentOfficePersonData.jsp b/src/main/webapp/WEB-INF/jsp/studentOffice/studentOfficePersonData.jsp
@@ -82,7 +82,9 @@
     </div>
 </div>
 <div class="spin"></div>
-<div id="mb"></div>
+<div id="mb">
+    <p class="spinText">首次加载时间较长，请耐心等待...</p>
+</div>
 <script>
 
     // 打开文件

diff --git a/src/main/webapp/WEB-INF/jsp/studentOffice/studentOfficePublicData.jsp b/src/main/webapp/WEB-INF/jsp/studentOffice/studentOfficePublicData.jsp
@@ -108,7 +108,9 @@
     </div>
 </div>
 <div class="spin"></div>
-<div id="mb"></div>
+<div id="mb">
+    <p class="spinText">首次加载时间较长，请耐心等待...</p>
+</div>
 <script>
     // 打开文件
     function openFile(id) {

diff --git a/src/main/webapp/WEB-INF/jsp/teacher/applyAddDataClass.jsp b/src/main/webapp/WEB-INF/jsp/teacher/applyAddDataClass.jsp
@@ -84,7 +84,7 @@
                     </div>
                     <div class="form-group">
                         <label>类目属性:</label>
-                        <a id="addProperty" class="btn btn-success btn-sm" href="javascript: void(0);" style="margin-left: -30px;">添加属性</a>
+                        <a id="addProperty" class="btn btn-success btn-sm" href="javascript: void(0);" style="margin-left: 5px;">添加属性</a>
                         <a id="removeProperty" class="btn btn-warning btn-sm" href="javascript: void(0);">删除属性</a>
                         <div id="selectProperty" class="form-group"></div>
                     </div>

diff --git a/src/main/webapp/WEB-INF/jsp/teacher/teacherPersonData.jsp b/src/main/webapp/WEB-INF/jsp/teacher/teacherPersonData.jsp
@@ -80,7 +80,9 @@
     </div>
 </div>
 <div class="spin"></div>
-<div id="mb"></div>
+<div id="mb">
+    <p class="spinText">首次加载时间较长，请耐心等待...</p>
+</div>
 <script>
     // 打开文件
     function openFile(id) {

diff --git a/src/main/webapp/WEB-INF/jsp/teacher/teacherPublicData.jsp b/src/main/webapp/WEB-INF/jsp/teacher/teacherPublicData.jsp
@@ -105,7 +105,9 @@
     </div>
 </div>
 <div class="spin"></div>
-<div id="mb"></div>
+<div id="mb">
+    <p class="spinText">首次加载时间较长，请耐心等待...</p>
+</div>
 <script>
 
     $("#dataClassFilter").change(function () {

diff --git a/src/main/webapp/resources/css/common.css b/src/main/webapp/resources/css/common.css
@@ -25,4 +25,12 @@ a{
     left: 0;
     opacity:0.6;
     z-index: 999999;
+}
+
+.spinText{
+    z-index: 9999999;
+    text-align: center;
+    color: #fff;
+    margin-top: 370px;
+    font-size: 18px;
 }