Merge branch 'main' of http://10.10.14.176:3000/huanghai/ccZhiChengTouPiao

WebRoot/html/toupiao_login.html

@@ -114,7 +114,7 @@
                     if (result.success) {
                         window.location.href = '/FengHuang/html/tp/index.html';
                     } else {
-                        alert(result.msg);
+                        alert(result.message);
                         refreshCaptcha();
                     }
                 }

src/main/java/com/dsideal/FengHuang/LoginPerson/Controller/LoginPersonController.java

@@ -166,7 +166,7 @@ public class LoginPersonController extends Controller {
             TouPiaoModel tm = new TouPiaoModel();
             if (tm.haveFinishTouPiao(username)) {
                 resultJson.put("success", false);
-                resultJson.put("msg", "您已经投票完成，不能再次进入系统！");
+                resultJson.put("message", "您已经投票完成，不能再次进入系统！");
                 renderJson(resultJson);
                 return;
             }

src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java

@@ -62,7 +62,7 @@ public class TouPiaoController extends Controller {
         if (tm.haveFinishTouPiao(toupiaoren_tel)) {
             Kv kv = Kv.create();
             kv.put("success", false);
-            kv.put("msg", "您已经投票完成，不能再次进入系统！");
+            kv.put("message", "您已经投票完成，不能重复投票！");
             renderJson(kv);
             return;
         }

src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java

@@ -14,7 +14,7 @@ import java.util.Map;
 public class TouPiaoModel {
 
     public List<Record> getHouXuanRenList(int type_id) {
-        String sql = "select * from t_toupiao_houxuanren where houxuanren_type_id=?";
+        String sql = "select * from t_toupiao_houxuanren where houxuanren_type_id=? order by sort_id";
         return Db.find(sql, type_id);
     }
 
@@ -34,7 +34,8 @@ public class TouPiaoModel {
 
     public boolean haveFinishTouPiao(String toupiaoren_tel) {
         String sql = "select count(1) as c from t_toupiao_result where toupiaoren_tel=?";
-        return Db.findFirst(sql, toupiaoren_tel).getInt("c") > 0;
+        int cnt=Db.findFirst(sql, toupiaoren_tel).getInt("c");
+        return cnt > 0;
     }
 
     public void save(String toupiaoren_tel, String[] gaojiArray, String[] zhongjiArray) {
@@ -52,7 +53,7 @@ public class TouPiaoModel {
             record.set("houxuanren_name", _map.get(s).getStr("toupiaoren_name"));
             record.set("houxuanren_type_id", 1);
 
-            record.set("toupiaoren_tel", s);
+            record.set("toupiaoren_tel", toupiaoren_tel);
             record.set("toupiaoren_name", _map.get(s).getStr("toupiaoren_name"));
             record.set("toupiaoren_type_id", toupiaoren_type_id);
             saveList.add(record);
@@ -63,7 +64,7 @@ public class TouPiaoModel {
             record.set("houxuanren_name", _map.get(s).getStr("toupiaoren_name"));
             record.set("houxuanren_type_id", 2);
 
-            record.set("toupiaoren_tel", s);
+            record.set("toupiaoren_tel", toupiaoren_tel);
             record.set("toupiaoren_name", _map.get(s).getStr("toupiaoren_name"));
             record.set("toupiaoren_type_id", toupiaoren_type_id);
             saveList.add(record);

一键推拉.cmd

@@ -8,4 +8,8 @@ git add -A .
 git commit -am 'commit'
 git fetch
 git pull
-git push origin master
+
+:: GitHub报错：error: src refspec master does not match any
+:: https://www.deep-os.com/?id=73
+
+git push origin main