diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java index 8c4ab25a2e..dd1cd558a6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java @@ -29,6 +29,7 @@ import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.NewUserRoleResultDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.excel.UserRoleExcel; import com.epmet.service.UserRoleService; import org.springframework.beans.factory.annotation.Autowired; @@ -153,7 +154,7 @@ public class UserRoleController { * @return com.epmet.commons.tools.utils.Result */ @PostMapping("getresidentrole") - public Result getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) { - return new Result().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId())); + public Result getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) { + return new Result().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId())); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index f9a8f2dd66..62e59d9b98 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java @@ -20,8 +20,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.GetRoleKeyListFormDTO; import com.epmet.dto.form.UserRoleFormDTO; -import com.epmet.dto.result.PartyMemberUserIdsResultDTO; import com.epmet.dto.result.NewUserRoleResultDTO; +import com.epmet.dto.result.PartyMemberUserIdsResultDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -96,5 +97,5 @@ public interface UserRoleDao extends BaseDao { * @param userId * @return java.util.List */ - NewUserRoleResultDTO selectResidentRole(@Param("customerId") String customerId, @Param("userId") String userId); + UserRoleResultDTO selectResidentRole(@Param("customerId") String customerId, @Param("userId") String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java index 7c44014e65..38f9ff02ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.NewUserRoleResultDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import java.util.List; @@ -139,5 +140,5 @@ public interface UserRoleService extends BaseService { * @param userId * @return com.epmet.dto.result.UserRoleResultDTO */ - NewUserRoleResultDTO getUserResidentRole(String customerId, String userId); + UserRoleResultDTO getUserResidentRole(String customerId, String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java index 8631c36114..efb6eac3b5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.dto.RoleDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.NewUserRoleResultDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import com.epmet.service.RoleService; import com.epmet.service.UserRoleService; @@ -158,7 +159,7 @@ public class UserRoleServiceImpl extends BaseServiceImpl - SELECT er.ROLE_NAME, er.ROLE_KEY