diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/select/DeptUserTreeDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/select/DeptUserTreeDto.java index a8675a0..3a12153 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/select/DeptUserTreeDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/select/DeptUserTreeDto.java @@ -20,6 +20,10 @@ public class DeptUserTreeDto { * 名称 */ private String name; + /** + * 名称-英文 + */ + private String nameEn; public Integer getType() { return type; @@ -52,4 +56,12 @@ public class DeptUserTreeDto { public void setName(String name) { this.name = name; } + + public String getNameEn() { + return nameEn; + } + + public void setNameEn(String nameEn) { + this.nameEn = nameEn; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java index 86176fb..a3d1cb5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java @@ -71,6 +71,7 @@ public class StudySubjectServiceImpl extends ServiceImpl - (SELECT d.dept_id AS id, d.parent_id, d.dept_name AS `name`, d.type + (SELECT d.dept_id AS id, d.parent_id, d.dept_name AS `name`, d.dept_name AS `nameEn`, d.type FROM sys_dept d WHERE d.del_flag = '0' ORDER BY d.`dept_id` DESC) UNION ALL - (SELECT u.`user_id` AS id,u.`dept_id` AS parent_id,u.`nick_name` AS `name`,7 AS `type` FROM `sys_user` u + (SELECT u.`user_id` AS id,u.`dept_id` AS parent_id,u.`nick_name` AS `name`,u.`user_name` AS `nameEn`,7 AS `type` FROM `sys_user` u WHERE u.`del_flag`='0' AND u.`user_id`<>1 ORDER BY u.`user_id` DESC)