toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:事业部配置新增学科字段修改&分页查询用户详细信息（带部门角色）

Browse Source
This commit is contained in:
zhuxinru
2026-04-10 13:57:45 +08:00
parent ea43b5830c
commit 56589b1303
24 changed files with 100 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/sdm/common/entity/req/system/DeptQueryReq.java
View File

@@ -11,6 +11,6 @@ public class DeptQueryReq extends BaseReq {
private String deptName;
@Schema(description = "学科")
private String subject;
private String discipline;
}

3
common/src/main/java/com/sdm/common/entity/req/system/UserQueryReq.java
View File

@@ -1,5 +1,6 @@
package com.sdm.common.entity.req.system;
import com.sdm.common.entity.BaseReq;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
@@ -15,7 +16,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class UserQueryReq {
public class UserQueryReq extends BaseReq {
@Schema(description = "用户ID")
@NotNull(message = "用户ID不能为空")
private Long userId;

2
common/src/main/java/com/sdm/common/entity/resp/system/SysDeptUserResp.java
View File

@@ -20,7 +20,7 @@ public class SysDeptUserResp {
private String deptName;
@Schema(description = "学科")
private String subject;
private String discipline;
@Schema(description = "阶段")
private String stage;

8
common/src/main/java/com/sdm/common/feign/impl/system/SysDeptFeignClientImpl.java
View File

@@ -40,16 +40,16 @@ public class SysDeptFeignClientImpl implements ISysDeptFeignClient {
}
@Override
public SdmResponse<List<SysDeptUserResp>> queryByDeptAndSubject(DeptQueryReq req) {
public SdmResponse<List<SysDeptUserResp>> queryByDeptAndDiscipline(DeptQueryReq req) {
SdmResponse<List<SysDeptUserResp>> response = null;
try {
response = sysDeptFeignClient.queryByDeptAndSubject(req);
response = sysDeptFeignClient.queryByDeptAndDiscipline(req);
if (response == null || !response.isSuccess()) {
log.error("queryByDeptAndSubject failed response:{}", JSONObject.toJSONString(Optional.ofNullable(response)));
log.error("queryByDeptAndDiscipline failed response:{}", JSONObject.toJSONString(Optional.ofNullable(response)));
return SdmResponse.failed("根据部门和学科查询负责人失败");
}
} catch (Exception e) {
log.error("queryByDeptAndSubject error response:{}", JSONObject.toJSONString(Optional.ofNullable(response)));
log.error("queryByDeptAndDiscipline error response:{}", JSONObject.toJSONString(Optional.ofNullable(response)));
return SdmResponse.failed("根据部门和学科查询负责人失败");
}
return response;

4
common/src/main/java/com/sdm/common/feign/inter/system/ISysDeptFeignClient.java
View File

@@ -17,7 +17,7 @@ public interface ISysDeptFeignClient {
@GetMapping("/dept/listDept")
SdmResponse<PageDataResp<List<SysDeptUserResp>>> listDept(@SpringQueryMap DeptQueryReq req);
@GetMapping("/dept/queryByDeptAndSubject")
SdmResponse<List<SysDeptUserResp>> queryByDeptAndSubject(@SpringQueryMap DeptQueryReq req);
@GetMapping("/dept/queryByDeptAndDiscipline")
SdmResponse<List<SysDeptUserResp>> queryByDeptAndDiscipline(@SpringQueryMap DeptQueryReq req);
}