From e6d513b0561d0edc5d433d195c502a6c39afb159 Mon Sep 17 00:00:00 2001
From: zhaoxinyu <zhaoxinyu0716@gmail.com>
Date: Tue, 7 May 2024 10:37:08 +0800
Subject: [PATCH] condolence jug

---
 .../java/io/v/nutz/jsz/controller/mobile/loginController.java  | 3 ++-
 .../retired/user/controller/RetiredUserListController.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/v/nutz/jsz/controller/mobile/loginController.java b/src/main/java/io/v/nutz/jsz/controller/mobile/loginController.java
index 0e65124..007f39c 100644
--- a/src/main/java/io/v/nutz/jsz/controller/mobile/loginController.java
+++ b/src/main/java/io/v/nutz/jsz/controller/mobile/loginController.java
@@ -36,6 +36,7 @@ public class loginController {
                     	u.loginname,
                     	u.sex,
                     	u.mobile,
+                    	u.retirePhone,
                     	u.birthday,
                     	unit.`name` unitname,
                     	u.unitid,
@@ -55,7 +56,7 @@ public class loginController {
             sql.setVar("schoolCode", Globals.schoolCode);
             Cnd cnd = Cnd.NEW();
 //            cnd.and("LOWER(u.loginname)", "=", loginname.trim().toLowerCase());
-            cnd.and(Cnd.exps("LOWER(u.loginname)", "=", loginname.trim().toLowerCase()).or("LOWER(u.mobile)", "=", loginname.trim().toLowerCase()));
+            cnd.and(Cnd.exps("LOWER(u.loginname)", "=", loginname.trim().toLowerCase()).or("LOWER(u.retirePhone)", "=", loginname.trim().toLowerCase()));
             cnd.and("LOWER(u.username)", "=", username.trim().toLowerCase());
             sql.setCondition(cnd);
             sql.setCallback(Sqls.callback.map());
diff --git a/src/main/java/io/v/nutz/retired/user/controller/RetiredUserListController.java b/src/main/java/io/v/nutz/retired/user/controller/RetiredUserListController.java
index 91f7928..7c16018 100644
--- a/src/main/java/io/v/nutz/retired/user/controller/RetiredUserListController.java
+++ b/src/main/java/io/v/nutz/retired/user/controller/RetiredUserListController.java
@@ -380,6 +380,7 @@ public class RetiredUserListController {
             List<ActivityUserScope> userScopeList = new ArrayList<>();
             Sql sql = Sqls.create("SELECT MAX(DISTINCT groupId) AS groupId FROM activity_user_scope");
             NutMap query = (NutMap) Daos.query(dao, sql.toString(), Sqls.callback.map());
+            Integer groupId = query.getInt("groupId") + 1;
 
             String groupName = DateUtil.thisYear() + "年" + (DateUtil.thisMonth() + 1) + "月离退休教职工";
 
@@ -422,7 +423,7 @@ public class RetiredUserListController {
 
                 ActivityUserScope userScope = new ActivityUserScope();
                 userScope.setGroupName(groupName);
-                userScope.setGroupId(Integer.parseInt(query.getString("groupId")));
+                userScope.setGroupId(groupId);
                 if (Lang.isNotEmpty(sysUser)) {
                     user.setId(sysUser.getId());
                     userScope.setUserId(sysUser.getId());