Commit d72b25e6 by huangZW

111

parent 09b75f19
...@@ -217,7 +217,7 @@ public class StaffController extends WebBaseController{ ...@@ -217,7 +217,7 @@ public class StaffController extends WebBaseController{
staffVO.setStaffName(clerk.getClerkName()); staffVO.setStaffName(clerk.getClerkName());
staffVO.setNationCode(clerk.getNationcode()); staffVO.setNationCode(clerk.getNationcode());
staffVO.setPhoneNumber(clerk.getPhoneNumber()); staffVO.setPhoneNumber(clerk.getPhoneNumber());
staffVO.setPostion(clerk.getPositionName()); staffVO.setPosition(clerk.getPositionName());
staffVO.setHeadImg(clerk.getHeadImgUrl()); staffVO.setHeadImg(clerk.getHeadImgUrl());
staffVO.setDepartmentName(storeDTO==null?"":storeDTO.getStoreName()); staffVO.setDepartmentName(storeDTO==null?"":storeDTO.getStoreName());
} }
...@@ -234,7 +234,7 @@ public class StaffController extends WebBaseController{ ...@@ -234,7 +234,7 @@ public class StaffController extends WebBaseController{
staffVO.setStaffName(staff.getStaffName()); staffVO.setStaffName(staff.getStaffName());
staffVO.setNationCode(staff.getNationCode()); staffVO.setNationCode(staff.getNationCode());
staffVO.setPhoneNumber(staff.getPhoneNumber()); staffVO.setPhoneNumber(staff.getPhoneNumber());
staffVO.setPostion(staff.getPostion()); staffVO.setPosition(staff.getPostion());
staffVO.setHeadImg(staff.getHeadImg()); staffVO.setHeadImg(staff.getHeadImg());
if(CollectionUtil.isNotEmpty(list)){ if(CollectionUtil.isNotEmpty(list)){
String departmentId = list.get(0).getDepartmentId(); String departmentId = list.get(0).getDepartmentId();
......
...@@ -17,7 +17,7 @@ public class StaffVO implements Serializable{ ...@@ -17,7 +17,7 @@ public class StaffVO implements Serializable{
private String nationCode; private String nationCode;
private String postion; private String position;
private String departmentName; private String departmentName;
...@@ -55,12 +55,13 @@ public class StaffVO implements Serializable{ ...@@ -55,12 +55,13 @@ public class StaffVO implements Serializable{
this.nationCode = nationCode; this.nationCode = nationCode;
} }
public String getPostion() {
return postion; public String getPosition() {
return position;
} }
public void setPostion(String postion) { public void setPosition(String position) {
this.postion = postion; this.position = position;
} }
public String getDepartmentName() { public String getDepartmentName() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment