c-zhouhf1/zhgh_jvic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

condolence jug

Browse Source
This commit is contained in:
zhaoxinyu
2024-05-07 10:37:08 +08:00
parent 6c8e8f518a
commit e6d513b056
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/jsz/controller/mobile/loginController.java
+2 -1
View File
@@ -36,6 +36,7 @@ public class loginController {
u.loginname, u.loginname,
u.sex, u.sex,
u.mobile, u.mobile,
u.retirePhone,
u.birthday, u.birthday,
unit.`name` unitname, unit.`name` unitname,
u.unitid, u.unitid,
@@ -55,7 +56,7 @@ public class loginController {
sql.setVar("schoolCode", Globals.schoolCode); sql.setVar("schoolCode", Globals.schoolCode);
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
// cnd.and("LOWER(u.loginname)", "=", loginname.trim().toLowerCase()); // 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()); cnd.and("LOWER(u.username)", "=", username.trim().toLowerCase());
sql.setCondition(cnd); sql.setCondition(cnd);
sql.setCallback(Sqls.callback.map()); sql.setCallback(Sqls.callback.map());
src/main/java/io/v/nutz/retired/user/controller/RetiredUserListController.java
+2 -1
View File
@@ -380,6 +380,7 @@ public class RetiredUserListController {
List<ActivityUserScope> userScopeList = new ArrayList<>(); List<ActivityUserScope> userScopeList = new ArrayList<>();
Sql sql = Sqls.create("SELECT MAX(DISTINCT groupId) AS groupId FROM activity_user_scope"); 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()); NutMap query = (NutMap) Daos.query(dao, sql.toString(), Sqls.callback.map());
Integer groupId = query.getInt("groupId") + 1;
String groupName = DateUtil.thisYear() + "年" + (DateUtil.thisMonth() + 1) + "月离退休教职工"; String groupName = DateUtil.thisYear() + "年" + (DateUtil.thisMonth() + 1) + "月离退休教职工";
@@ -422,7 +423,7 @@ public class RetiredUserListController {
ActivityUserScope userScope = new ActivityUserScope(); ActivityUserScope userScope = new ActivityUserScope();
userScope.setGroupName(groupName); userScope.setGroupName(groupName);
userScope.setGroupId(Integer.parseInt(query.getString("groupId"))); userScope.setGroupId(groupId);
if (Lang.isNotEmpty(sysUser)) { if (Lang.isNotEmpty(sysUser)) {
user.setId(sysUser.getId()); user.setId(sysUser.getId());
userScope.setUserId(sysUser.getId()); userScope.setUserId(sysUser.getId());