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/admin/teacher/service/impl/TeacherService.java | 11 +
src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java | 8
src/main/java/com/qxueyou/scc/user/service/impl/UserService.java | 8
src/main/java/com/qxueyou/scc/sys/action/LoginController.java | 2
src/main/java/com/qxueyou/scc/controller/TeacherController.java | 25 +++
src/main/java/com/qxueyou/scc/sys/service/impl/PriviledgeService.java | 2
src/main/java/com/qxueyou/scc/user/model/UserRole.java | 310 +++++++++++++++++++-------------------
src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java | 48 +++++
src/main/java/com/qxueyou/scc/admin/classes/model/ClsClass.java | 21 ++
src/main/java/com/qxueyou/scc/controller/ClassController.java | 2
src/main/java/com/qxueyou/scc/user/dao/UserRoleDAO.java | 18 +
11 files changed, 280 insertions(+), 175 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/classes/model/ClsClass.java b/src/main/java/com/qxueyou/scc/admin/classes/model/ClsClass.java
index d589787..26ff4a0 100644
--- a/src/main/java/com/qxueyou/scc/admin/classes/model/ClsClass.java
+++ b/src/main/java/com/qxueyou/scc/admin/classes/model/ClsClass.java
@@ -321,6 +321,12 @@
/** 鐝骇鑰佸笀 */
@Column(name = "TEACHER_ID", length = 32)
private String teacherId;
+ /** 鐝富浠诲悕绉� */
+ @Column(name = "CHARGE_CLASS_NAME", length = 32)
+ private String chargeClassName;
+ /** 鐝富浠籭d */
+ @Column(name = "CHARGE_CLASS_ID ", length = 32)
+ private String chargeClassId;
@ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
@JoinTable(name = "CLS_CLASS_RE_SUBJECT", joinColumns = {
@@ -341,6 +347,21 @@
@JsonIgnore
private List<MediaVideoLive> videoLives;
+ public String getChargeClassName() {
+ return chargeClassName;
+ }
+
+ public void setChargeClassName(String chargeClassName) {
+ this.chargeClassName = chargeClassName;
+ }
+
+ public String getChargeClassId() {
+ return chargeClassId;
+ }
+
+ public void setChargeClassId(String chargeClassId) {
+ this.chargeClassId = chargeClassId;
+ }
public String getTeacherId() {
return teacherId;
diff --git a/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java b/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java
index dbf0cb3..4138bff 100644
--- a/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java
+++ b/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java
@@ -134,23 +134,59 @@
public ClsClass read(String classId) {
return read(ClsClass.class, classId);
}
+//
+// /**
+// * 鍘熷锛氳幏鍙栫彮绾у垪琛�
+// */
+// @Override
+// public List<ClsClass> getClassLst(String keyword, String teacherId, Integer pageSize, Integer pageNum, Integer pageType) {
+// String keyword_ = StringUtils.isBlank(keyword) ? "" : keyword;
+//// System.out.println(keyword_);
+// StringBuffer hql = new StringBuffer("from ClsClass c where c.deleteFlag is false and c.orgId=? and c.name like ? and c.createId=?");
+//
+// if (pageType == 1) {
+// hql.append(" and c.endTime >= sysdate() ");
+// }else if(pageType == 2) {
+// hql.append(" and c.endTime < sysdate() ");
+// }
+//// System.out.println("vvvvv"+ClientUtils.getOrgId()+"333333333"+ClientUtils.getUserId());
+// List<Object> args = CollectionUtils.newList(ClientUtils.getOrgId(),keyword_ + "%",ClientUtils.getUserId());
+//// System.out.println(args);
+// if (!StringUtils.isEmpty(teacherId)) {
+// hql.append(" and exists( select 1 from ClsClassReSubject r,Subject t where r.subjectId=t.subjectId and c.classId= r.classId and t.teacherId=? and r.deleteFlag is false and t.deleteFlag is false)");
+// args.add(teacherId);
+// }
+//
+// hql.append(" order by c.createTime desc");
+//// System.out.println(hql.toString());
+//// System.out.println(findList(hql.toString(), new Pager(pageSize, pageNum), args, ClsClass.class));
+// return findList(hql.toString(), new Pager(pageSize, pageNum), args, ClsClass.class);
+// }
/**
- * 鑾峰彇鐝骇鍒楄〃
+ * 浼樺寲鑾峰彇鐝骇鍒楄〃
+ * @param keyword
+ * @param teacherId
+ * @param pageSize
+ * @param pageNum
+ * @param pageType
+ * @return
*/
- @Override
public List<ClsClass> getClassLst(String keyword, String teacherId, Integer pageSize, Integer pageNum, Integer pageType) {
String keyword_ = StringUtils.isBlank(keyword) ? "" : keyword;
// System.out.println(keyword_);
- StringBuffer hql = new StringBuffer("from ClsClass c where c.deleteFlag is false and c.orgId=? and c.name like ? and c.createId=?");
+ StringBuffer hql = new StringBuffer("from ClsClass c where c.deleteFlag is false and c.orgId=? and c.name like ? ");
if (pageType == 1) {
hql.append(" and c.endTime >= sysdate() ");
}else if(pageType == 2) {
hql.append(" and c.endTime < sysdate() ");
}
-// System.out.println("vvvvv"+ClientUtils.getOrgId()+"333333333"+ClientUtils.getUserId());
- List<Object> args = CollectionUtils.newList(ClientUtils.getOrgId(),keyword_ + "%",ClientUtils.getUserId());
+// if (!StringUtils.isEmpty(teacherId)) {
+// hql.append("and c.createId=?)");
+// }
+// System.out.println("vvvvv"+ClientUtils.getOrgId()+"333333333"+ClientUtils.getUserId()); ,ClientUtils.getUserId()
+ List<Object> args = CollectionUtils.newList(ClientUtils.getOrgId(),keyword_ + "%");
// System.out.println(args);
if (!StringUtils.isEmpty(teacherId)) {
hql.append(" and exists( select 1 from ClsClassReSubject r,Subject t where r.subjectId=t.subjectId and c.classId= r.classId and t.teacherId=? and r.deleteFlag is false and t.deleteFlag is false)");
@@ -348,7 +384,7 @@
public List<Map<String,Object>> queryAllClassIdAndName() {
StringBuffer hql = new StringBuffer(500);
// c.deleteFlag is false and
- hql.append("select c.classId as classId ,c.name as className from ClsClass c where c.endTime>=:endTime and c.orgId=:orgId " );
+ hql.append("select c.classId as classId ,c.name as className from ClsClass c where c.endTime>=:endTime and deleteFlag is false and c.orgId=:orgId " );
return this.findListWithMapByHql(hql.toString(), CollectionUtils.newObjectMap("endTime",new Date(),"orgId",ClientUtils.getOrgId()));
}
diff --git a/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java b/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java
index 53a09ab..84024fa 100644
--- a/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java
+++ b/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java
@@ -37,16 +37,19 @@
TeacherDAO dao;
/**
- * 鏁欏笀绠＄悊鏂板
+// * 鏁欏笀绠＄悊鏂板
+ *鍚庡彴鐢ㄦ埛鍒濆鍖�
*/
@Override
public Result add(String teacherName, String password, String mobilePhone, String teacherNo) {
if (dao.exists(teacherNo) || userService.exists(teacherNo)) {
- return new Result(false, "鑰佸笀缂栧彿宸插瓨鍦ㄦ垨琚叾浠栫敤鎴峰崰鐢�");
+// return new Result(false, "鑰佸笀缂栧彿宸插瓨鍦ㄦ垨琚叾浠栫敤鎴峰崰鐢�");
+ return new Result(false, "鐢ㄦ埛缂栧彿宸插瓨鍦ㄦ垨琚叾浠栫敤鎴峰崰鐢�");
}
User user = userService.insertUser(teacherName, teacherNo, mobilePhone, password, Boolean.FALSE, ClientUtils.getOrgId());
+// userService.insertUser(teacherName, teacherNo, mobilePhone, password, Boolean.FALSE, ClientUtils.getOrgId());
userService.addRole(user.getUserId(), UserRole.ROLE_TEACHER_ID);
@@ -82,10 +85,12 @@
save(teacher);
User user = read(User.class, teacher.getUserId());
+ user.setMobilePhone(mobilePhone);
+ user.setName(teacherName);
user.setAccount(teacherNo);
TraceUtils.setCreateTrace(user);
save(user);
-
+
if(StringUtils.isNotEmpty(password)){
userService.updatePassword(teacher.getUserId(), password);
}
diff --git a/src/main/java/com/qxueyou/scc/controller/ClassController.java b/src/main/java/com/qxueyou/scc/controller/ClassController.java
index 4f177a3..e377ae4 100644
--- a/src/main/java/com/qxueyou/scc/controller/ClassController.java
+++ b/src/main/java/com/qxueyou/scc/controller/ClassController.java
@@ -312,7 +312,7 @@
int count = classService.getClassLstCount(keyword, teacherId, pageType);
// 杞垚鍓嶇鎵�闇�瀛楁鍜岀粨鏋�
List<Map<String, Object>> lstResult = QBeanUtils.listBean2ListMap(clsLst,
- CollectionUtils.newStringMap("name", "className", "classId", "classId", "classNumber", "classNumber","classTypes","classTypes",
+ CollectionUtils.newStringMap("chargeClassName","chargeClassId","name", "className", "classId", "classId", "classNumber", "classNumber","classTypes","classTypes",
"studentCount", "studentCount", "createTime", "createTime", "startTime", "startTime", "endTime",
"endTime", "subjects", "sbjLst"));
diff --git a/src/main/java/com/qxueyou/scc/controller/TeacherController.java b/src/main/java/com/qxueyou/scc/controller/TeacherController.java
index 2564cdb..54a1d54 100644
--- a/src/main/java/com/qxueyou/scc/controller/TeacherController.java
+++ b/src/main/java/com/qxueyou/scc/controller/TeacherController.java
@@ -39,6 +39,31 @@
* @param keyword
* 绱㈡悳鍏抽敭瀛�
*/
+// @GetMapping(value = "lstTeacher")
+// public Result lstTeacher(String keyword, Integer pageSize, Integer pageNum) {
+//
+// List<UserTeacher> teacherLst = teacherService.lstTeacher(keyword == null ? "" : keyword.trim(), pageSize, pageNum);
+//
+// int count = teacherService.findTeacherCount(keyword == null ? "" : keyword.trim());
+//
+// return new Result(true, "success",
+// CollectionUtils.newObjectMap("teacherLst",
+// QBeanUtils.listBean2ListMap(teacherLst,
+// CollectionUtils.newStringMap("mobilePhone", "mobilePhone,account", "name",
+// "teacherName", "teacherId", "teacherId", "teacherNo", "teacherNo")),
+// "teacherCount", count));
+// }
+
+ /**
+ * 鍚庡彴鐢ㄦ埛绠＄悊鏄剧ず鍒楄〃
+ *
+ * @param pageSize
+ * 姣忛〉鏄剧ず鍑犳潯
+ * @param pageNum
+ * 椤电爜
+ * @param keyword
+ * 绱㈡悳鍏抽敭瀛�
+ */
@GetMapping(value = "lstTeacher")
public Result lstTeacher(String keyword, Integer pageSize, Integer pageNum) {
diff --git a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
index 4e12b38..96d2416 100644
--- a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
+++ b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
@@ -472,7 +472,7 @@
}
/**
- * 鍏ラ獙璇�
+ * 鍏ラ獙璇�
* @param user
* @param type
* @param request
diff --git a/src/main/java/com/qxueyou/scc/sys/service/impl/PriviledgeService.java b/src/main/java/com/qxueyou/scc/sys/service/impl/PriviledgeService.java
index 615bf0b..cb382c1 100644
--- a/src/main/java/com/qxueyou/scc/sys/service/impl/PriviledgeService.java
+++ b/src/main/java/com/qxueyou/scc/sys/service/impl/PriviledgeService.java
@@ -321,7 +321,7 @@
@Override
public Result getMenus(User user) {
- String hql = "select m.menuId as index ,m.name as title ,m.url as router , m.hover as hover , "
+ String hql = "select DISTINCT m.menuId as index ,m.name as title ,m.url as router , m.hover as hover , "
+ " m.icon as icon ,m.parentMenuId as parentMenuId ,m.menuOrder as menuOrder from SysMenu m , UserReRoleUser u ,"
+ "SysPrivilege s where m.deleteFlag is false and u.deleteFlag is false and s.deleteFlag is false and "
+ "u.userId =:userId and u.roleId = s.roleId and s.menuId = m.menuId order by m.menuOrder ";
diff --git a/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java b/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
index a272d69..3441543 100644
--- a/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
+++ b/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
@@ -129,11 +129,11 @@
public Result updateStudent(String studentId, String name,String password, String studentNo, boolean sex, String phoneNo) {
//鏍规嵁瀛﹀鍛業D锛岃幏鍙栫敤鎴蜂俊鎭�
StuStudent stu = this.read(StuStudent.class, studentId);
-
- if (!stu.getStudentNo().equals(studentNo) && dao.exists(studentNo,ClientUtils.getOrgId())) {
- return new Result(false, "瀛﹀彿宸插瓨鍦�");
+ if(stu.getStudentNo() != null){
+ if (!stu.getStudentNo().equals(studentNo) && dao.exists(studentNo,ClientUtils.getOrgId())) {
+ return new Result(false, "瀛﹀彿宸插瓨鍦�");
+ }
}
-
stu.setName(name);
stu.setSex(sex);
stu.setStudentNo(studentNo);
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 c9f099e..8cb3a70 100644
--- a/src/main/java/com/qxueyou/scc/user/dao/UserRoleDAO.java
+++ b/src/main/java/com/qxueyou/scc/user/dao/UserRoleDAO.java
@@ -51,15 +51,27 @@
/**
* 鍒犻櫎浜哄憳
*/
+// 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;
diff --git a/src/main/java/com/qxueyou/scc/user/model/UserRole.java b/src/main/java/com/qxueyou/scc/user/model/UserRole.java
index dda8895..2410fc4 100644
--- a/src/main/java/com/qxueyou/scc/user/model/UserRole.java
+++ b/src/main/java/com/qxueyou/scc/user/model/UserRole.java
@@ -31,7 +31,6 @@
/**
* The persistent class for the user_role database table.
- *
*/
@Entity
@Table(name = "user_role")
@@ -39,192 +38,195 @@
@NamedQuery(name = "UserRole.findAll", query = "SELECT u FROM UserRole u")
public class UserRole implements Serializable, com.qxueyou.scc.base.model.ITrace {
- /**
- * UID
- */
- private static final long serialVersionUID = 2698140980142511930L;
+ /**
+ * UID
+ */
+ private static final long serialVersionUID = 2698140980142511930L;
- public static Integer ROLE_TYPE_ADMIN = 1;
-
- public static String ROLE_TEACHER_ID = "2";
-
- public static String ROLE_ADMIN_ID = "3";
-
- @Id
- @GeneratedValue(generator = "hibernate-uuid")
- @GenericGenerator(name = "hibernate-uuid", strategy = "uuid")
- @Column(name = "ROLE_ID", unique = true, nullable = false, length = 32)
- private String roleId;
+ public static Integer ROLE_TYPE_ADMIN = 1;
- @Column(name = "CREATE_ID", nullable = false, length = 32)
- private String createId;
+ // public static String ROLE_TEACHER_ID = "2";
+ //鑰佸笀瑙掕壊id
+ public static String ROLE_TEACHER_ID = "2c9048668b0e633d018b6a06e896026a";
- @Column(name = "CREATE_TIME", nullable = false)
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
- @Column(name = "CREATOR", nullable = false, length = 100)
- private String creator;
+ public static String ROLE_ADMIN_ID = "3";
- @Column(name = "DELETE_FLAG", nullable = false)
- private boolean deleteFlag;
+ @Id
+ @GeneratedValue(generator = "hibernate-uuid")
+ @GenericGenerator(name = "hibernate-uuid", strategy = "uuid")
+ @Column(name = "ROLE_ID", unique = true, nullable = false, length = 32)
+ private String roleId;
- @Column(name = "NAME", length = 150)
- private String name;
-
- @Column(name = "TOP_ORG_ID", length = 150)
- private String topOrgId;
+ @Column(name = "CREATE_ID", nullable = false, length = 32)
+ private String createId;
- @Column(name = "UPDATE_ID", length = 32)
- private String updateId;
+ @Column(name = "CREATE_TIME", nullable = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
- @Column(name = "UPDATE_TIME", nullable = false)
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
+ @Column(name = "CREATOR", nullable = false, length = 100)
+ private String creator;
- @Column(name = "UPDATOR", length = 100)
- private String updator;
+ @Column(name = "DELETE_FLAG", nullable = false)
+ private boolean deleteFlag;
+
+ @Column(name = "NAME", length = 150)
+ private String name;
+
+ @Column(name = "TOP_ORG_ID", length = 150)
+ private String topOrgId;
+
+ @Column(name = "UPDATE_ID", length = 32)
+ private String updateId;
+
+ @Column(name = "UPDATE_TIME", nullable = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ @Column(name = "UPDATOR", length = 100)
+ private String updator;
// @Column(name = "ENAME", length = 100)
// private String ename;
- @Column(name = "type", length = 2)
- private String type;
+ @Column(name = "type", length = 2)
+ private String type;
- @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- @JoinTable(name = "USER_RE_ROLE_USER", joinColumns = { @JoinColumn(name = "ROLE_ID") }, inverseJoinColumns = {
- @JoinColumn(name = "USER_ID") })
- @GeneratedValue(generator = "hibernate-uuid1")
- @GenericGenerator(name = "hibernate-uuid1", strategy = "uuid")
- @CollectionId(columns = @Column(name = "RE_ID"), type = @Type(type = "string"), generator = "hibernate-uuid1")
- @JsonIgnore
- private List<User> users;
+ @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ @JoinTable(name = "USER_RE_ROLE_USER", joinColumns = {@JoinColumn(name = "ROLE_ID")}, inverseJoinColumns = {
+ @JoinColumn(name = "USER_ID")})
+ @GeneratedValue(generator = "hibernate-uuid1")
+ @GenericGenerator(name = "hibernate-uuid1", strategy = "uuid")
+ @CollectionId(columns = @Column(name = "RE_ID"), type = @Type(type = "string"), generator = "hibernate-uuid1")
+ @JsonIgnore
+ private List<User> users;
- @ManyToMany(fetch = FetchType.LAZY, mappedBy = "roles")
- private List<SysMenu> menus;
+ @ManyToMany(fetch = FetchType.LAZY, mappedBy = "roles")
+ private List<SysMenu> menus;
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "userRole")
- @JsonIgnore
- private List<SysPrivilege> sysPrivileges;
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "userRole")
+ @JsonIgnore
+ private List<SysPrivilege> sysPrivileges;
- @OneToMany(mappedBy = "userRole", fetch = FetchType.LAZY)
- @JsonIgnore
- private List<UserReRoleUser> res;
-
- @Transient
- private boolean isMe;
+ @OneToMany(mappedBy = "userRole", fetch = FetchType.LAZY)
+ @JsonIgnore
+ private List<UserReRoleUser> res;
- public List<SysMenu> getMenus() {
- return menus;
- }
+ @Transient
+ private boolean isMe;
- public void setMenus(List<SysMenu> menus) {
- this.menus = menus;
- }
+ public List<SysMenu> getMenus() {
+ return menus;
+ }
- public List<User> getUsers() {
- return users;
- }
+ public void setMenus(List<SysMenu> menus) {
+ this.menus = menus;
+ }
- public void setUsers(List<User> users) {
- this.users = users;
- }
+ public List<User> getUsers() {
+ return users;
+ }
- public String getRoleId() {
- return this.roleId;
- }
+ public void setUsers(List<User> users) {
+ this.users = users;
+ }
- public void setRoleId(String roleId) {
- this.roleId = roleId;
- }
+ public String getRoleId() {
+ return this.roleId;
+ }
- public String getCreateId() {
- return this.createId;
- }
+ public void setRoleId(String roleId) {
+ this.roleId = roleId;
+ }
- public void setCreateId(String createId) {
- this.createId = createId;
- }
+ public String getCreateId() {
+ return this.createId;
+ }
- public Date getCreateTime() {
- return this.createTime;
- }
+ public void setCreateId(String createId) {
+ this.createId = createId;
+ }
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
+ public Date getCreateTime() {
+ return this.createTime;
+ }
- public String getCreator() {
- return this.creator;
- }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
- public void setCreator(String creator) {
- this.creator = creator;
- }
+ public String getCreator() {
+ return this.creator;
+ }
- public boolean getDeleteFlag() {
- return this.deleteFlag;
- }
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
- public void setDeleteFlag(boolean deleteFlag) {
- this.deleteFlag = deleteFlag;
- }
+ public boolean getDeleteFlag() {
+ return this.deleteFlag;
+ }
- public String getName() {
- return this.name;
- }
+ public void setDeleteFlag(boolean deleteFlag) {
+ this.deleteFlag = deleteFlag;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public String getName() {
+ return this.name;
+ }
- public String getUpdateId() {
- return this.updateId;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public void setUpdateId(String updateId) {
- this.updateId = updateId;
- }
+ public String getUpdateId() {
+ return this.updateId;
+ }
- public Date getUpdateTime() {
- return this.updateTime;
- }
+ public void setUpdateId(String updateId) {
+ this.updateId = updateId;
+ }
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
+ public Date getUpdateTime() {
+ return this.updateTime;
+ }
- public String getUpdator() {
- return this.updator;
- }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
- public void setUpdator(String updator) {
- this.updator = updator;
- }
+ public String getUpdator() {
+ return this.updator;
+ }
- public List<SysPrivilege> getSysPrivileges() {
- return sysPrivileges;
- }
+ public void setUpdator(String updator) {
+ this.updator = updator;
+ }
- public void setSysPrivileges(List<SysPrivilege> sysPrivileges) {
- this.sysPrivileges = sysPrivileges;
- }
+ public List<SysPrivilege> getSysPrivileges() {
+ return sysPrivileges;
+ }
- public List<UserReRoleUser> getRes() {
- return res;
- }
+ public void setSysPrivileges(List<SysPrivilege> sysPrivileges) {
+ this.sysPrivileges = sysPrivileges;
+ }
- public void setRes(List<UserReRoleUser> res) {
- this.res = res;
- }
+ public List<UserReRoleUser> getRes() {
+ return res;
+ }
- public boolean getMe() {
- return isMe;
- }
+ public void setRes(List<UserReRoleUser> res) {
+ this.res = res;
+ }
- public void setMe(boolean isMe) {
- this.isMe = isMe;
- }
+ public boolean getMe() {
+ return isMe;
+ }
+
+ public void setMe(boolean isMe) {
+ this.isMe = isMe;
+ }
// public String getEname() {
// return ename;
@@ -234,20 +236,20 @@
// this.ename = ename;
// }
- public String getType() {
- return type;
- }
+ public String getType() {
+ return type;
+ }
- public void setType(String type) {
- this.type = type;
- }
+ public void setType(String type) {
+ this.type = type;
+ }
- public String getTopOrgId() {
- return topOrgId;
- }
+ public String getTopOrgId() {
+ return topOrgId;
+ }
- public void setTopOrgId(String topOrgId) {
- this.topOrgId = topOrgId;
- }
+ public void setTopOrgId(String topOrgId) {
+ this.topOrgId = topOrgId;
+ }
}
\ No newline at end of file
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 ad29f25..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) {
--
Gitblit v1.8.0