|
@@ -335,11 +335,24 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
|
}
|
|
|
|
|
|
//-------------用户维护BEGAIN------------------------
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 用户列表翻页信息查询
|
|
|
+ *
|
|
|
+ * @param sysUserQueryVO 用户列表翻页信息入参
|
|
|
+ * @return 用户列表翻页信息
|
|
|
+ */
|
|
|
public IPage<SysUserQueryDTO> userPageFac(SysUserQueryVO sysUserQueryVO) {
|
|
|
sysUserQueryVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
|
|
|
return this.userPage(sysUserQueryVO);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 获取用户科室
|
|
|
+ *
|
|
|
+ * @param sysUserBaseVO 获取用户科室入参
|
|
|
+ * @return 用户科室信息
|
|
|
+ */
|
|
|
public SysUserDeptDTO getUserDepts(SysUserBaseVO sysUserBaseVO) {
|
|
|
checkUser(sysUserBaseVO.getUserId());
|
|
|
SysUserDeptDTO sysUserDeptDTO = new SysUserDeptDTO();
|
|
@@ -374,6 +387,12 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
|
return sysUserDeptDTO;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 获取用户角色
|
|
|
+ *
|
|
|
+ * @param sysUserBaseVO 获取用户角色入参
|
|
|
+ * @return 用户角色信息
|
|
|
+ */
|
|
|
public SysUserRoleDTO getUserRoles(SysUserBaseVO sysUserBaseVO) {
|
|
|
checkUser(sysUserBaseVO.getUserId());
|
|
|
SysUserRoleDTO sysUserRoleDTO = new SysUserRoleDTO();
|
|
@@ -408,6 +427,12 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
|
return sysUserRoleDTO;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 用户启用
|
|
|
+ *
|
|
|
+ * @param sysUserBaseVO 用户启用入参
|
|
|
+ * @return 是否成功
|
|
|
+ */
|
|
|
public Boolean enable(SysUserBaseVO sysUserBaseVO) {
|
|
|
checkUser(sysUserBaseVO.getUserId());
|
|
|
Date now = DateUtil.now();
|
|
@@ -422,6 +447,12 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
|
);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 用户停用
|
|
|
+ *
|
|
|
+ * @param sysUserBaseVO 用户停用入参
|
|
|
+ * @return 是否成功
|
|
|
+ */
|
|
|
public Boolean disable(SysUserBaseVO sysUserBaseVO) {
|
|
|
checkUser(sysUserBaseVO.getUserId());
|
|
|
Date now = DateUtil.now();
|
|
@@ -436,11 +467,17 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
|
);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 编辑用户科室
|
|
|
+ *
|
|
|
+ * @param sysUserDeptVO 编辑用户科室入参
|
|
|
+ * @return 是否成功
|
|
|
+ */
|
|
|
public Boolean editUserDepts(SysUserDeptVO sysUserDeptVO) {
|
|
|
checkUser(sysUserDeptVO.getUserId());
|
|
|
Date now = DateUtil.now();
|
|
|
String userId = SysUserUtils.getCurrentPrincipleID();
|
|
|
- //删除原部门
|
|
|
+ //删除原科室
|
|
|
sysUserDeptService.update(new UpdateWrapper<SysUserDept>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("user_id", sysUserDeptVO.getUserId())
|
|
@@ -448,7 +485,7 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
|
.set("modifier", userId)
|
|
|
.set("gmt_modified", now)
|
|
|
);
|
|
|
- //新增新部门
|
|
|
+ //新增新科室
|
|
|
if (ListUtil.isNotEmpty(sysUserDeptVO.getDeptIds())) {
|
|
|
List<SysUserDept> sysUserDeptList = new ArrayList<>();
|
|
|
for (String deptId : sysUserDeptVO.getDeptIds()) {
|
|
@@ -473,6 +510,12 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
|
);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 编辑用户角色
|
|
|
+ *
|
|
|
+ * @param sysUserRoleVO 编辑用户角色入参
|
|
|
+ * @return 是否成功
|
|
|
+ */
|
|
|
public Boolean editUserRoles(SysUserRoleVO sysUserRoleVO) {
|
|
|
checkUser(sysUserRoleVO.getUserId());
|
|
|
Date now = DateUtil.now();
|
|
@@ -512,8 +555,13 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 确认用户是否是管理员下的用户
|
|
|
+ *
|
|
|
+ * @param userId 用户Id
|
|
|
+ */
|
|
|
private void checkUser(Long userId) {
|
|
|
- //确认用户是否是管理员下的用户
|
|
|
+ //确认用户是否是管理员统一医院下的用户
|
|
|
Integer cnt = sysUserHospitalFacade.count(new QueryWrapper<SysUserHospital>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("user_id", userId)
|