|
@@ -20,6 +20,7 @@ import com.diagbot.entity.UserOrganization;
|
|
import com.diagbot.entity.UserRole;
|
|
import com.diagbot.entity.UserRole;
|
|
import com.diagbot.entity.wrapper.MenuWrapper;
|
|
import com.diagbot.entity.wrapper.MenuWrapper;
|
|
import com.diagbot.enums.AuthStatusEnum;
|
|
import com.diagbot.enums.AuthStatusEnum;
|
|
|
|
+import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.OrganizationTypeEnum;
|
|
import com.diagbot.enums.OrganizationTypeEnum;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.exception.CommonException;
|
|
@@ -187,7 +188,7 @@ public class UserFacade extends UserServiceImpl {
|
|
//查询机构下是否已存在用户信息,如已存在,就抛异常,需求待核实
|
|
//查询机构下是否已存在用户信息,如已存在,就抛异常,需求待核实
|
|
Map paramMap1 = new HashMap();
|
|
Map paramMap1 = new HashMap();
|
|
paramMap1.put("organization_id", orgId);
|
|
paramMap1.put("organization_id", orgId);
|
|
- paramMap1.put("is_deleted", "N");
|
|
|
|
|
|
+ paramMap1.put("is_deleted", IsDeleteEnum.N.getKey());
|
|
List<UserOrganization> res1 = userOrganizationFacade.selectByMap(paramMap1);
|
|
List<UserOrganization> res1 = userOrganizationFacade.selectByMap(paramMap1);
|
|
if (ListUtil.isNotEmpty(res1)) {
|
|
if (ListUtil.isNotEmpty(res1)) {
|
|
throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该机构下已存在用户,不能再添加别的用户!");
|
|
throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该机构下已存在用户,不能再添加别的用户!");
|
|
@@ -411,13 +412,17 @@ public class UserFacade extends UserServiceImpl {
|
|
Organization organization = organizationFacade.getByUserId(userId);
|
|
Organization organization = organizationFacade.getByUserId(userId);
|
|
QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
|
|
QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
|
|
qw.eq("user_id", userId);
|
|
qw.eq("user_id", userId);
|
|
- qw.eq("is_deleted", "N");
|
|
|
|
|
|
+ qw.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
UserAuthentication userAuthentication = userAuthenticationFacade.getOne(qw);
|
|
UserAuthentication userAuthentication = userAuthenticationFacade.getOne(qw);
|
|
|
|
|
|
GetConsoleUserInfoDTO getConsoleUserInfoDTO = new GetConsoleUserInfoDTO();
|
|
GetConsoleUserInfoDTO getConsoleUserInfoDTO = new GetConsoleUserInfoDTO();
|
|
- getConsoleUserInfoDTO.setUser(user);
|
|
|
|
- getConsoleUserInfoDTO.setOrganization(organization);
|
|
|
|
- getConsoleUserInfoDTO.setUserAuthentication(userAuthentication);
|
|
|
|
|
|
+ getConsoleUserInfoDTO.setUserName(user.getUsername());
|
|
|
|
+ getConsoleUserInfoDTO.setOrganizationName(organization.getName());
|
|
|
|
+ getConsoleUserInfoDTO.setUserStatus(AuthStatusEnum.getName(userAuthentication.getStatus()));
|
|
|
|
+
|
|
|
|
+// getConsoleUserInfoDTO.setUser(user);
|
|
|
|
+// getConsoleUserInfoDTO.setOrganization(organization);
|
|
|
|
+// getConsoleUserInfoDTO.setUserAuthentication(userAuthentication);
|
|
|
|
|
|
return getConsoleUserInfoDTO;
|
|
return getConsoleUserInfoDTO;
|
|
}
|
|
}
|