From c2c8075ca3d7f75f5aa3ce152709380b2980b7ee Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 05 Jan 2021 16:48:51 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 9 +++++++-- zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java | 2 ++ zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java index c5018bc..5858e80 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java @@ -14,6 +14,7 @@ import com.matrix.system.app.vo.UserAchieveVo; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.common.service.SysUsersService; +import com.matrix.system.common.tools.DataAuthUtil; import com.matrix.system.hive.bean.SysBeauticianState; import com.matrix.system.hive.bean.SysWorkBeatuistaff; import com.matrix.system.hive.service.AchieveNewService; @@ -114,8 +115,12 @@ SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); SysUsers query = new SysUsers(); - query.setCompanyId(sysUsers.getCompanyId()); - query.setShopId(sysUsers.getShopId()); + if (DataAuthUtil.hasAllShopAuth()) { + query.setCompanyId(sysUsers.getCompanyId()); + } else { + query.setCompanyId(sysUsers.getCompanyId()); + query.setShopId(sysUsers.getShopId()); + } query.setSuName(usersQueryDto.getQueryKey()); List<SysUsers> list = sysUsersService.findByModel(query); List<BeauticianVo> dataList = SysUsersMapper.INSTANCE.usersListToBeautyList(list); diff --git a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java index 4bcfc7a..0a238e8 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java +++ b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java @@ -18,6 +18,8 @@ @Mapping(source = "suId", target = "id") @Mapping(source = "suName", target = "name") + @Mapping(source = "suPhoto", target = "photo") + @Mapping(source = "suTel", target = "telphone") public abstract BeauticianVo sysUsersToBeauticianVo(SysUsers sysUsers); public abstract List<BeauticianVo> usersListToBeautyList(List<SysUsers> list); diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java index e7cafcc..8e25766 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java @@ -15,6 +15,10 @@ private String roleName; + private String photo; + + private String telphone; + public Long getId() { return id; } @@ -38,4 +42,20 @@ public void setRoleName(String roleName) { this.roleName = roleName; } + + public String getPhoto() { + return photo; + } + + public void setPhoto(String photo) { + this.photo = photo; + } + + public String getTelphone() { + return telphone; + } + + public void setTelphone(String telphone) { + this.telphone = telphone; + } } -- Gitblit v1.9.1