111

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

@@ -86,10 +86,14 @@ public class StoreController extends WebBaseController{
 			for(StoreVO VO : resultList){
 				StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = map.get(VO.getDepartmentId());
 				if(staffDepartmentRelatedDTO != null){
+					String clerkCode = staffDepartmentRelatedDTO.getClerkCode();
+
 					VO.setBindFlag(1);
-					VO.setClerkCode(staffDepartmentRelatedDTO.getClerkCode());
+					VO.setClerkCode(clerkCode);
 					VO.setStaffDepartmentRelatedId(staffDepartmentRelatedDTO.getStaffDepartmentRelatedId());
 					VO.setStaffId(staffId);
+					ClerkDTO clerkDTO  = clerkService.getClerkByClerkCode(VO.getEnterpriseId(), clerkCode);
+					VO.setClerkId(clerkDTO == null?"":clerkDTO.getClerkId());
 				}else{
 					VO.setBindFlag(0);
 				}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StoreVO.java

@@ -18,9 +18,16 @@ public class StoreVO implements Serializable {
     private int bindFlag;
     private String staffDepartmentRelatedId;
     private String clerkCode;
+    private String clerkId;
     private String storeImg;
     private int clerkType;
 
+	public String getClerkId() {
+		return clerkId;
+	}
+	public void setClerkId(String clerkId) {
+		this.clerkId = clerkId;
+	}
 	public String getEnterpriseId() {
 		return enterpriseId;
 	}