设置创建人处理查询人的数据

This commit is contained in:
zer0Black
2022-06-18 16:18:13 +08:00
parent 873a776f10
commit 4682901bb6
4 changed files with 46 additions and 1 deletions
@@ -26,6 +26,7 @@ import com.jero.common.util.RedisUtil;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.base.service.BaseCommonService;
import com.jero.modules.system.entity.*; import com.jero.modules.system.entity.*;
import com.jero.modules.system.enums.UserOrDepartEnum;
import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.model.DepartIdModel;
import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.model.SysUserSysDepartModel;
import com.jero.modules.system.service.*; import com.jero.modules.system.service.*;
@@ -1554,6 +1555,7 @@ public class SysUserController {
SysUserDepartVO sysUserDepartVO = new SysUserDepartVO(); SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
sysUserDepartVO.setKey(sysDepart.getId()); sysUserDepartVO.setKey(sysDepart.getId());
sysUserDepartVO.setTitle(sysDepart.getDepartName()); sysUserDepartVO.setTitle(sysDepart.getDepartName());
sysUserDepartVO.setFlag(UserOrDepartEnum.USER.getValue());
list.add(sysUserDepartVO); list.add(sysUserDepartVO);
} }
} }
@@ -1562,6 +1564,7 @@ public class SysUserController {
SysUserDepartVO sysUserDepartVO = new SysUserDepartVO(); SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
sysUserDepartVO.setKey(sysUser.getId()); sysUserDepartVO.setKey(sysUser.getId());
sysUserDepartVO.setTitle(sysUser.getUsername()); sysUserDepartVO.setTitle(sysUser.getUsername());
sysUserDepartVO.setFlag(UserOrDepartEnum.DEPART.getValue());
list.add(sysUserDepartVO); list.add(sysUserDepartVO);
} }
} }
@@ -0,0 +1,28 @@
package com.jero.modules.system.enums;
/**
* @Author: liyawei
* @Description:
* @Date: Created in 14:12 2022/5/26
*/
public enum UserOrDepartEnum {
USER("同步部门","USER"),
DEPART("同步用户","DEPART");
private String name;
private String value;
private UserOrDepartEnum(String name, String value) {
this.name = name;
this.value = value;
}
public String getName() {
return name;
}
public String getValue() {
return value;
}
}
@@ -11,6 +11,8 @@ public class SysUserDepartVO {
private String title; private String title;
private String flag; //departuser 2个属性
public String getKey() { public String getKey() {
return key; return key;
} }
@@ -26,4 +28,12 @@ public class SysUserDepartVO {
public void setTitle(String title) { public void setTitle(String title) {
this.title = title; this.title = title;
} }
public String getFlag() {
return flag;
}
public void setFlag(String flag) {
this.flag = flag;
}
} }
+5 -1
View File
@@ -136,7 +136,11 @@
}, },
getUserAndDepart() { getUserAndDepart() {
getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => { getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
this.gData = res || [] if (res){
this.gData = res.filter(ele => ele.flag === 'DEPART');
} else {
this.gData = []
}
this.visibleTree = true this.visibleTree = true
}) })
}, },