111

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

@@ -77,12 +77,35 @@ public class StoreController extends WebBaseController{
 			for(StoreVO VO : resultList){
 				StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = map.get(VO.getDepartmentId());
 				if(staffDepartmentRelatedDTO != null){
-					VO.setBindFlag("1");
+					VO.setBindFlag(1);
 					VO.setClerkCode(staffDepartmentRelatedDTO.getClerkCode());
 					VO.setStaffDepartmentRelatedId(staffDepartmentRelatedDTO.getStaffDepartmentRelatedId());
 					VO.setStaffId(staffId);
 				}else{
-					VO.setBindFlag("0");
+					VO.setBindFlag(0);
+				}
+			}
+		}
+		//3、判断是否是店长
+		for(StoreVO VO : resultList){
+			//已经绑定的门店
+			if(VO.getBindFlag()==1){
+				String clerkCode = VO.getClerkCode();
+				if(StringUtils.isEmpty(clerkCode)){
+					VO.setClerkType(0);
+				}else{
+					//查gic门店
+					StoreDTO storeDTO = storeService.getStore(VO.getStoreId());
+					if(storeDTO != null){
+						//查gic门店店长
+						ClerkDTO clerkDTO = clerkService.getClerkByClerkId(storeDTO.getClerkId());
+						if(clerkDTO != null){
+							//code相同，则置为1
+							if(clerkCode.equals(clerkDTO.getClerkCode())){
+								VO.setClerkType(1);
+							}
+						}
+					}
 				}
 			}
 		}

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

@@ -18,6 +18,14 @@ public class ClerkVo implements Serializable {
     private String phoneNumber;
     private String bindFlag;
     private String clerkName;
+    private int clerkType;
+
+	public int getClerkType() {
+		return clerkType;
+	}
+	public void setClerkType(int clerkType) {
+		this.clerkType = clerkType;
+	}
 	public String getClerkId() {
 		return clerkId;
 	}

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

@@ -14,11 +14,18 @@ public class StoreVO implements Serializable {
     private String staffId;
     private String storeName;
     private String wxEnterpriseId;
-    private String bindFlag;
+    private int bindFlag;
     private String staffDepartmentRelatedId;
     private String clerkCode;
     private String storeImg;
-    
+    private int clerkType;
+
+	public int getClerkType() {
+		return clerkType;
+	}
+	public void setClerkType(int clerkType) {
+		this.clerkType = clerkType;
+	}
 	public String getDepartmentId() {
 		return departmentId;
 	}
@@ -49,10 +56,11 @@ public class StoreVO implements Serializable {
 	public void setWxEnterpriseId(String wxEnterpriseId) {
 		this.wxEnterpriseId = wxEnterpriseId;
 	}
-	public String getBindFlag() {
+	
+	public int getBindFlag() {
 		return bindFlag;
 	}
-	public void setBindFlag(String bindFlag) {
+	public void setBindFlag(int bindFlag) {
 		this.bindFlag = bindFlag;
 	}
 	public String getStaffDepartmentRelatedId() {