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/dao/UserRoleDAO.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/user/dao/UserRoleDAO.java b/src/main/java/com/qxueyou/scc/user/dao/UserRoleDAO.java
index 719ba89..8cb3a70 100644
--- a/src/main/java/com/qxueyou/scc/user/dao/UserRoleDAO.java
+++ b/src/main/java/com/qxueyou/scc/user/dao/UserRoleDAO.java
@@ -19,7 +19,7 @@
public class UserRoleDAO extends BaseDAO {
/**
- * 获取角色列表
+ * 鑾峰彇瑙掕壊鍒楄〃
*/
public List<UserRole> getUserRoleLst(String keyword) {
return find("from UserRole where deleteFlag is false and name like ? and topOrgId=?",
@@ -27,7 +27,7 @@
}
/**
- * 获取人员列表
+ * 鑾峰彇浜哄憳鍒楄〃
*/
public List<Map<String, Object>> getUserLstByRoleId(String roleId, Integer pageSize, Integer pageNum,
String keyword) {
@@ -40,7 +40,7 @@
}
/**
- * 获取人员列表总条数
+ * 鑾峰彇浜哄憳鍒楄〃鎬绘潯鏁�
*/
public int getUserCount(String roleId, String keyword) {
return findCountByComplexHql("select count(1) from User u , UserReRoleUser r where u .deleteFlag is false "
@@ -49,17 +49,29 @@
}
/**
- * 删除人员
+ * 鍒犻櫎浜哄憳
*/
+// public boolean delete(String userId) {
+// String[] userIds = userId.split(",");
+// String deleteUserByhql = " update User set deleteFlag = true where deleteFlag is false and userId = ?";
+// String deleteUserReByHql = "update UserReRoleUser set deleteFlag =true where deleteFlag is false and userId = ?";
+//
+// Result deleteUserResult = bulkUpdateInLoop(deleteUserByhql, userIds);
+// Result deleteUserReResult = bulkUpdateInLoop(deleteUserReByHql, userIds);
+//
+// if (deleteUserResult.isSuccess() && deleteUserReResult.isSuccess()) {
+// return true;
+// }
+// return false;
+//
+// }
public boolean delete(String userId) {
String[] userIds = userId.split(",");
- String deleteUserByhql = " update User set deleteFlag = true where deleteFlag is false and userId = ?";
String deleteUserReByHql = "update UserReRoleUser set deleteFlag =true where deleteFlag is false and userId = ?";
- Result deleteUserResult = bulkUpdateInLoop(deleteUserByhql, userIds);
Result deleteUserReResult = bulkUpdateInLoop(deleteUserReByHql, userIds);
- if (deleteUserResult.isSuccess() && deleteUserReResult.isSuccess()) {
+ if ( deleteUserReResult.isSuccess()) {
return true;
}
return false;
@@ -67,7 +79,7 @@
}
/**
- * 获取角色信息
+ * 鑾峰彇瑙掕壊淇℃伅
*/
public List<Map<String, Object>> findMenuLstById(String roleId) {
String hql = "select m.name as name ,m.menuId as menuId ,'1' as type from UserRole u ,SysPrivilege p ,SysMenu m where u.roleId = p.roleId and "
@@ -77,7 +89,7 @@
}
/**
- * 修改角色信息
+ * 淇敼瑙掕壊淇℃伅
*
* @param roleId
* @param menuId
@@ -106,7 +118,7 @@
}
/**
- * 删除角色
+ * 鍒犻櫎瑙掕壊
*
* @param roleId
* @return
@@ -125,7 +137,7 @@
}
/**
- * 获取所有菜单的列表
+ * 鑾峰彇鎵�鏈夎彍鍗曠殑鍒楄〃
*
* @return
*/
@@ -137,7 +149,7 @@
}
/**
- * 添加教师
+ * 娣诲姞鏁欏笀
*
* @param teacherIds
* @param roleId
--
Gitblit v1.8.0