页面无法登录问题修复，以及任务书模块审批回退按钮标识

src/main/resources/mapper/PrjProjectDao.xml

@@ -433,7 +433,7 @@
                 order by ${sortName} ${sortOrder}
             </when>
             <otherwise>
-                order by p.ID asc
+                order by p.ID desc
             </otherwise>
         </choose>
     </select>

src/main/resources/templates/login/login.html

@@ -348,7 +348,10 @@
 
 <script type="text/javascript" th:inline="javascript">
     AjaxUtil.ctx = /*[[@{/}]]*/'';
+    // 在页面加载完毕后调用拦截器函数
+
     layui.use(['form', 'layNotify'], function () {
+
         var form = layui.form,
             layNotify = layui.layNotify;
 
@@ -464,11 +467,13 @@
                 },
                 error: function (error) {
                     loginend();
+                    redirection();
                     layNotify.notice({
                         title: "登录提示",
                         type: "error",
                         message: "请求失败，请联系系统管理员！"
                     });
+
                 }
             });
 
@@ -483,6 +488,9 @@
             }
         });
 
+        function redirection(){
+            window.location.replace("http://10.208.114.107:8081/home/")
+        }
         // 登陆中
         function logining() {
             document.getElementById("btn_login").setAttribute("disabled", true);//设置不可点击
@@ -516,7 +524,13 @@
         //     });
         // }
 
+
+
     });
+
+
+
+
 </script>
 
 </body>

target/classes/mapper/PrjProjectDao.xml

@@ -433,7 +433,7 @@
                 order by ${sortName} ${sortOrder}
             </when>
             <otherwise>
-                order by p.ID asc
+                order by p.ID desc
             </otherwise>
         </choose>
     </select>

target/classes/templates/login/login.html

@@ -9,7 +9,7 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">
-    <link rel="icon" th:href="@{/images/favicon.ico}">
+    <link rel="icon" th:href="@{//images/favicon.ico}">
     <link rel="stylesheet" th:href="@{/lib/layui/css/layui.css}" media="all">
 
     <style th:inline="text">
@@ -38,30 +38,30 @@
         }
 
         .login-main .login-bottom .center .item .icon-1 {
-            background: url("[[@{/}]]images/icon-login.png") no-repeat 1px 0;
+            background: url("/images/icon-login.png") no-repeat 1px 0;
         }
 
         .login-main .login-bottom .center .item .icon-2 {
-            background: url("[[@{/}]]images/icon-login.png") no-repeat -54px 0;
+            background: url("/images/icon-login.png") no-repeat -54px 0;
         }
 
         .login-main .login-bottom .center .item .icon-3 {
-            background: url("[[@{/}]]images/icon-login.png") no-repeat -106px 0;
+            background: url("/images/icon-login.png") no-repeat -106px 0;
         }
 
         .login-main .login-bottom .center .item .icon-4 {
-            background: url("[[@{/}]]images/icon-login.png") no-repeat 0 -43px;
+            background: url("/images/icon-login.png") no-repeat 0 -43px;
             position: absolute;
             right: -10px;
             cursor: pointer;
         }
 
         .login-main .login-bottom .center .item .icon-5 {
-            background: url("[[@{/}]]images/icon-login.png") no-repeat -55px -43px;
+            background: url("/images/icon-login.png") no-repeat -55px -43px;
         }
 
         .login-main .login-bottom .center .item .icon-6 {
-            background: url("[[@{/}]]images/icon-login.png") no-repeat 0 -93px;
+            background: url("/images/icon-login.png") no-repeat 0 -93px;
             position: absolute;
             right: -10px;
             margin-top: 8px;
@@ -85,7 +85,7 @@
             width: 14px;
             height: 14px;
             border: none;
-            background: url("[[@{/}]]images/icon-login.png") no-repeat -111px -48px;
+            background: url("/images/icon-login.png") no-repeat -111px -48px;
         }
 
         .login-main .login-bottom .center .item .icon {
@@ -175,7 +175,7 @@
         }
 
         body {
-            background: url("[[@{/}]]images/loginbg.jpg") 0% 0% / cover no-repeat;
+            background: url("/images/loginbg.jpg") 0% 0% / cover no-repeat;
             position: static;
             font-size: 12px;
         }
@@ -348,7 +348,10 @@
 
 <script type="text/javascript" th:inline="javascript">
     AjaxUtil.ctx = /*[[@{/}]]*/'';
+    // 在页面加载完毕后调用拦截器函数
+
     layui.use(['form', 'layNotify'], function () {
+
         var form = layui.form,
             layNotify = layui.layNotify;
 
@@ -464,11 +467,13 @@
                 },
                 error: function (error) {
                     loginend();
+                    redirection();
                     layNotify.notice({
                         title: "登录提示",
                         type: "error",
                         message: "请求失败，请联系系统管理员！"
                     });
+
                 }
             });
 
@@ -483,6 +488,9 @@
             }
         });
 
+        function redirection(){
+            window.location.replace("http://10.28.114.107:8081/home/")
+        }
         // 登陆中
         function logining() {
             document.getElementById("btn_login").setAttribute("disabled", true);//设置不可点击

target/classes/templates/prjproject/list.html

@@ -95,7 +95,7 @@
 <!--                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表-->
 <!--                </button>-->
                 <button class="layui-btn layui-btn-sm" lay-event="backSpacing" style="background: #FF8040" id="myButton">
-                    <i class="" style="font-size: 10px;"></i>审批回退
+                    <i class="layui-icon layui-icon-return" style="font-size: 10px;"></i>审批回退
                 </button>
             </div>
         </script>
@@ -130,6 +130,7 @@
         var form = layui.form,
             table = layui.table;
         var userId = $("#userId").val();
+
         var currTable = table.render({
             elem: '#currentTableId',
             url: AjaxUtil.ctx + 'prjProject/list',
@@ -168,12 +169,11 @@
                 // 测试打印出后端返回的权限列表
                 // let permissionSet = [[${permissionSet}]];
                 // console.log(JSON.stringify(permissionSet));
+                if ( userId != 40 && userId != 42 && userId != 1) {
+                    document.getElementById("myButton").style.display = 'none';
+                }
             }
         });
-/*        console.log("这是我要获取的当前账户userid" + userId)
-        if (userId != 119 ){
-            document.getElementById("myButton").style.display = 'none';
-        }*/
 
 
         // 监听搜索操作
@@ -223,9 +223,7 @@
             });
         });
 
-        if(userId != 40){
-            document.getElementById("myButton").style.display = 'none';
-        }
+
 
         // 监听行工具事件
         table.on('toolbar(currentTableFilter)', function (obj) {
@@ -506,7 +504,7 @@
                     layer.confirm('确定要将任务书回退至未提交状态吗？', function (index) {
                         layer.close(index);
                         AjaxUtil.post({
-                            url: AjaxUtil.ctx + "prjProject/upDataSpzt",
+                            url: AjaxUtil.ctx + "prjProject/upDataSpzt/"+userId,
                             contentType: "application/json",
                             data: JSON.stringify(data),
                             success: function (res) {