diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/query/projectplan/ProjectPlanQueryService.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/query/projectplan/ProjectPlanQueryService.java index fbc98cca2080c2d634ab1fea6b965a69a76bda36..93313636e3a8cc26667424c1b43f9ef5d8b310f4 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/application/query/projectplan/ProjectPlanQueryService.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/query/projectplan/ProjectPlanQueryService.java @@ -26,7 +26,7 @@ import java.util.List; public interface ProjectPlanQueryService extends BaseService<ProjectPlanBookPo> { /** - * 鏍规嵁鐢虫姤涔︾被鍨嬫煡璇㈤」鐩被鍨� + * 鏍规嵁鐢虫姤闃舵鏌ヨ椤圭洰绫诲瀷 * @param projectTypeQry 椤圭洰绫诲瀷qry * @return {@link Result}<{@link ProjectPlanBookOut}> */ diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java index 02a4836af57ece3e7df614d4c1bbedf5b65638b1..87e3d78ba91283fbcb0d2aef4945f6c4a96de283 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java @@ -2245,8 +2245,8 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook } /** - * 鏍规嵁鐢虫姤涔︾被鍨嬫煡璇㈤」鐩被鍨� - * @param projectTypeQry 鐢虫姤闃舵鍜屽勾浠� + * 鏍规嵁鐢虫姤闃舵鏌ヨ椤圭洰绫诲瀷 + * @param projectTypeQry 椤圭洰绫诲瀷 * @return {@link List}<{@link ProjectTypeOut}> */ @Override @@ -2285,7 +2285,9 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook RoleIdsAndOrganizationRequestDTO roleIdsAndOrganizationRequestDTO = RoleIdsAndOrganizationRequestDTO.builder().build(); List<Long> roleIdList = new ArrayList<>(1); //璐㈠姟澶勫鏍镐汉RoleId + roleIdList.add(new Long("1410485882880253953")); + roleIdsAndOrganizationRequestDTO.setRoleIds(roleIdList); roleIdsAndOrganizationRequestDTO.setOrganizationCode(null); Result<UserDTO> user = iUser.listByRoleIdsAndOrganization(roleIdsAndOrganizationRequestDTO); diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java index cf4662e2f9aa20c299789d56651f08048563e783..a265c790ddf2ae0f58a50308d2d5b3837808c22c 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java @@ -43,7 +43,7 @@ public class ProjectPlanController extends BaseController implements IProjectPla @Value("${import.enable}") private Boolean enableImport; - @ApiOperation("鏍规嵁鐢虫姤涔︾被鍨嬫煡璇㈤」鐩被鍨�") + @ApiOperation("鏍规嵁鐢虫姤闃舵鏌ヨ椤圭洰绫诲瀷") @Override public Result<ProjectTypeOut> queryProjectTypeByPlanType(@RequestBody ProjectTypeQry projectInfoPlanQry) { return ok(ResponseCode.SUCCESS,queryService.queryProjectTypeByPlanType(projectInfoPlanQry));