From bf13676673e9f0f090a68bd8cfbaefbf0d696d32 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期日, 26 十一月 2023 13:03:00 +0800
Subject: [PATCH] 讨论区关键字过滤、首页班级显示班级信息
---
src/main/java/com/qxueyou/scc/user/service/impl/UserService.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
index f994905..8f5418f 100644
--- a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
+++ b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
@@ -69,8 +69,12 @@
System.out.println(user.getOrganizationId());
System.out.println(user.getUserId());
+// String hql = "from UserReRoleUser u where deleteFlag is false and userId = ? ";
+//
+// find(hql, CollectionUtils.newList(param.getUserId()), UserReRoleUser.class);
+
ClsClass objClsClass = this.findUnique("select c from StuStudent t,"
- + " ClsClass c where c.classId = t.classId "
+ + "ClsClass c where c.classId = t.classId "
+ " and c.orgId = ? and t.userId = ? and t.status = ? order by t.createTime desc", CollectionUtils.newList(user.getOrganizationId(), user.getUserId(), StuStudent.STATUS_ACTIVE), ClsClass.class);
wrapper.setUser(user);
wrapper.setOrg(org);
@@ -86,11 +90,11 @@
}
@Override
- public User insertUser(String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
- return newUser(name, account, mobilePhone, password, sex, orgId);
+ public User insertUser( String photo,String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
+ return newUser( photo,name, account, mobilePhone, password, sex, orgId);
}
- private User newUser(String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
+ private User newUser(String photo,String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
//闅忔満瀛楃涓�
String salt= UUID.randomUUID().toString();
User user = new User();
@@ -103,6 +107,7 @@
String newPassword= DigestUtils.md5DigestAsHex((salt+password).getBytes());
user.setPassword(newPassword);
user.setMobilePhone(mobilePhone);
+ user.setImgPath(photo);
user.setSex(sex);
user.setOrganizationId(orgId);
save(user);
@@ -176,6 +181,9 @@
user.setImgPath(headPath);
TraceUtils.setUpdateTrace(user);
save(user);
+ this.bulkUpdate("update StuStudent set photo = ? , " +
+ " updateTime = sysdate(), updateId = ? , updator = ? where userId = ? " ,
+ new Object[]{ headPath,userId, ClientUtils.getUserName(), userId } );
return new Result(true);
}
@@ -183,7 +191,7 @@
/**
* 鐢ㄦ埛璁剧疆鎵嬫満鍙�
*
- * @param headPath
+ * @param
* @return
*/
public Result updateUserInfo(String userId, String mobilePhone) {
@@ -287,5 +295,9 @@
String hql = "from count User where sex=? and deleteFlag is false";
return new Result(true,findCount(hql,CollectionUtils.newList(1)));
}
-
+ @Override
+ public Result countUsersex() {
+ String hql = "from count User where sex=? and deleteFlag is false";
+ return new Result(true,findCount(hql,CollectionUtils.newList(0)));
+ }
}
--
Gitblit v1.8.0