Merge branch 'feature/login-token' into developer

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

@@ -60,11 +60,13 @@ public class StoreController extends WebBaseController {
 	private StaffClerkRelationApiService staffClerkRelationApiService;
 	@Autowired
 	private EnterpriseService enterpriseService;
+	@Autowired
+	private StaffApiService staffApiService;
 
 	//门店列表
 	@RequestMapping("/store-list")
 	@IgnoreLogin
-	public HaobanResponse storeList(String staffId,String wxEnterpriseId,String version) {
+	public HaobanResponse storeList(String staffId, String wxEnterpriseId, String version) {
 		if (StringUtils.isAnyBlank(staffId, wxEnterpriseId)) {
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
@@ -100,6 +102,10 @@ public class StoreController extends WebBaseController {
 			if (store == null) {
 				continue;
 			}
+			StaffDTO staffDTO = staffApiService.selectById(staffId);
+			if (staffDTO == null) {
+				continue;
+			}
 			//主门店标志
 			int mainStoreFlag = 0;
 			if (storeId.equals(store.getStoreId())) {
@@ -122,6 +128,7 @@ public class StoreController extends WebBaseController {
 			vo.setStoreName(store.getStoreName());
 			vo.setWxEnterpriseId(wxEnterpriseId);
 			vo.setClerkName(clerk.getClerkName());
+			vo.setHeadImg(staffDTO.getHeadImg());
 			vo.setBindFlag(1);
 			list.add(vo);
 		}

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

 package com.gic.haoban.manage.web.vo;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * Created 2018/10/22.
@@ -19,7 +18,8 @@ public class StaffStoreVO implements Serializable {
     private String clerkCode;
     private String clerkId;
     private String storeImg;
-    private int clerkType;
+	private String headImg;
+	private int clerkType;
     private Integer mainStoreFlag;
     private String phoneNumber;
 	private int bindFlag;
@@ -115,16 +115,24 @@ public class StaffStoreVO implements Serializable {
 	public int getClerkType() {
 		return clerkType;
 	}
+
 	public void setClerkType(int clerkType) {
 		this.clerkType = clerkType;
 	}
+
 	public Integer getMainStoreFlag() {
 		return mainStoreFlag;
 	}
+
 	public void setMainStoreFlag(Integer mainStoreFlag) {
 		this.mainStoreFlag = mainStoreFlag;
 	}
-    
 
-    
+	public String getHeadImg() {
+		return headImg;
+	}
+
+	public void setHeadImg(String headImg) {
+		this.headImg = headImg;
+	}
 }