From bef4f6d51bff03c0512a75f43e79699b7296f1fa Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期四, 23 十一月 2023 18:00:53 +0800
Subject: [PATCH] 修改系统角色逻辑、和老师身份逻辑

---
 src/main/java/com/qxueyou/scc/user/service/impl/UserService.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 71fab0c..467e05d 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);
@@ -183,7 +187,7 @@
     /**
      * 鐢ㄦ埛璁剧疆鎵嬫満鍙�
      *
-     * @param headPath
+     * @param
      * @return
      */
     public Result updateUserInfo(String userId, String mobilePhone) {
@@ -282,4 +286,14 @@
         return findCount("from User where account = ?", CollectionUtils.newList(account)) > 0;
     }
 
+    @Override
+    public Result countUser() {
+        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