|
|
@@ -10,12 +10,9 @@ import com.lantone.common.dto.GetDeptTreeDTO;
|
|
|
import com.lantone.common.dto.GetHospitalDeptDTO;
|
|
|
import com.lantone.common.dto.GetHospitalTreeDTO;
|
|
|
import com.lantone.common.dto.GetUserDTO;
|
|
|
+import com.lantone.common.dto.GetUserPageDTO;
|
|
|
import com.lantone.common.enums.IsDeleteEnum;
|
|
|
import com.lantone.common.enums.StatusEnum;
|
|
|
-import com.lantone.common.dto.GetUserPageDTO;
|
|
|
-import com.lantone.common.dto.HospitalDTO;
|
|
|
-import com.lantone.common.dto.UserMenuResourceTreeDTO;
|
|
|
-import com.lantone.common.dto.UserRoleDTO;
|
|
|
import com.lantone.common.exception.Asserts;
|
|
|
import com.lantone.common.util.DateUtil;
|
|
|
import com.lantone.common.util.EntityUtil;
|
|
|
@@ -131,14 +128,14 @@ public class UserManagementFacade {
|
|
|
User user = new User();
|
|
|
BeanUtils.copyProperties(addUserVO, user);
|
|
|
user.setGmtCreate(DateUtil.now());
|
|
|
- try{
|
|
|
+ try {
|
|
|
if (userFacade.save(user)) {
|
|
|
//2.插入用户所属组织
|
|
|
return saveUserHospital(addUserVO.getAddHospitalTreeVO(), user.getId(), addUserVO.getRoles());
|
|
|
} else {
|
|
|
Asserts.fail("用户添加失败");
|
|
|
}
|
|
|
- }catch (Exception e){
|
|
|
+ } catch (Exception e) {
|
|
|
Asserts.fail("用户添加失败");
|
|
|
}
|
|
|
return false;
|
|
|
@@ -276,7 +273,7 @@ public class UserManagementFacade {
|
|
|
private List<GetHospitalTreeDTO> getSonHospital(GetHospitalTreeDTO getHospitalTreeDTO) {
|
|
|
if (getHospitalTreeDTO.getHospitalId() != null) {
|
|
|
List<GetHospitalTreeDTO> sonHospitals = hospitalFacade.getBaseMapper()
|
|
|
- .getHospitalTreeInfo(getHospitalTreeDTO.getHospitalId(),getHospitalTreeDTO.getCreator());
|
|
|
+ .getHospitalTreeInfo(getHospitalTreeDTO.getHospitalId(), getHospitalTreeDTO.getCreator());
|
|
|
getHospitalTreeDTO.setHospitalDTOS(sonHospitals);
|
|
|
return sonHospitals;
|
|
|
}
|
|
|
@@ -478,9 +475,10 @@ public class UserManagementFacade {
|
|
|
}
|
|
|
return sonMenu;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
- * @Description获取登录用户的用户列表
|
|
|
* @param getUserPageVO
|
|
|
+ * @Description获取登录用户的用户列表
|
|
|
* @Return com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.common.dto.GetUserPageDTO>
|
|
|
*/
|
|
|
public IPage<GetUserPageDTO> getUserPage(GetUserPageVO getUserPageVO) {
|
rengb