diff --git a/common/src/main/java/com/sdm/common/entity/req/system/DeptQueryReq.java b/common/src/main/java/com/sdm/common/entity/req/system/DeptQueryReq.java index 33d163b0..dffc9a18 100644 --- a/common/src/main/java/com/sdm/common/entity/req/system/DeptQueryReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/system/DeptQueryReq.java @@ -13,4 +13,7 @@ public class DeptQueryReq extends BaseReq { @Schema(description = "学科") private String discipline; + @Schema(description = "仿真类型") + private String simulationType; + } diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java index 67caa74a..8e6420fc 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java @@ -143,6 +143,6 @@ public class SpdmNodeVo extends BaseEntity { /** * 完成进度 (已完成任务数+已闭环任务数)/ 任务总数 */ - private String progressNum; + private String progressNum = "0%"; } diff --git a/system/src/main/java/com/sdm/system/service/impl/ISysDeptUserServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/ISysDeptUserServiceImpl.java index b685afbf..47476d3d 100644 --- a/system/src/main/java/com/sdm/system/service/impl/ISysDeptUserServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/ISysDeptUserServiceImpl.java @@ -131,6 +131,9 @@ public class ISysDeptUserServiceImpl extends ServiceImpl sysDeptUsers = this.list(queryWrapper); if (CollectionUtils.isEmpty(sysDeptUsers)) { return SdmResponse.success(new ArrayList<>());