diff --git a/cutejava-front/src/views/components/business/CuteProductLineSelect.vue b/cutejava-front/src/views/components/business/CuteProductLineSelect.vue index 9a51449f..762adcf7 100644 --- a/cutejava-front/src/views/components/business/CuteProductLineSelect.vue +++ b/cutejava-front/src/views/components/business/CuteProductLineSelect.vue @@ -32,7 +32,7 @@ export default { name: 'CuteProductLineSelect', props: { value: { - type: [Number, String], + type: String, default: null }, disabled: { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteProductLineSelectProVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteProductLineSelectProVo.java index 6c6a9f7a..64c20471 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteProductLineSelectProVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteProductLineSelectProVo.java @@ -23,8 +23,13 @@ import lombok.Setter; @Getter @Setter public class CuteProductLineSelectProVo extends KitObject { - + /** + * 部门ID(select的value) + */ private String value; + /** + * 产品线,如"研发部/华南分部/devops组" + */ private String label; private List children; } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteProductLineSelectVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteProductLineSelectVo.java index e4c541d0..eae8f15a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteProductLineSelectVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteProductLineSelectVo.java @@ -26,7 +26,7 @@ public class CuteProductLineSelectVo extends KitObject { /** * 部门ID(select的value) */ - private Long value; + private String value; /** * 产品线,如"研发部/华南分部/devops组" */ diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteUserSelectVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteUserSelectVo.java index af3af17e..a03945c8 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteUserSelectVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/model/CuteUserSelectVo.java @@ -16,7 +16,16 @@ public class CuteUserSelectVo extends KitObject { * nickname */ private String label; + /** + * 部门ID + */ private String deptId; + /** + * 邮箱 + */ private String email; + /** + * 手机号 + */ private String phone; } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/service/CuteProductLineSelectService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/service/CuteProductLineSelectService.java index b6dea1db..ebcc28d6 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/service/CuteProductLineSelectService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/application/service/CuteProductLineSelectService.java @@ -36,7 +36,7 @@ public class CuteProductLineSelectService extends CuteBaseService { // 反转路径,从顶级部门到当前部门 Collections.reverse(pathIds); CuteProductLineSelectVo dto = new CuteProductLineSelectVo(); - dto.setValue(dept.getId()); + dto.setValue(Long.toString(dept.getId())); dto.setIdPath(pathIds.stream().map(String::valueOf).collect(Collectors.joining("-"))); // 保留名称路径用于显示 dto.setLabel(this.buildNamePath(dept, deptMap));