111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java

@@ -57,10 +57,20 @@ public class StaffDTO implements Serializable{
     private Boolean weixinPush;
     
     private long memberCount;
+    
+    private String clerkId;
 
     private static final long serialVersionUID = 1L;
 
-    public int getClerkType() {
+    public String getClerkId() {
+		return clerkId;
+	}
+
+	public void setClerkId(String clerkId) {
+		this.clerkId = clerkId;
+	}
+
+	public int getClerkType() {
 		return clerkType;
 	}
 

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

@@ -186,6 +186,7 @@ public class ClerkController extends WebBaseController{
 		for(StaffDTO dto :resultlist){
 			StaffClerkRelationDTO staffClerkRelationDTO = map.get(dto.getStaffId());
 			dto.setClerkCode(staffClerkRelationDTO.getClerkCode());
+			dto.setClerkId(staffClerkRelationDTO.getClerkId());
 			if(size < 20){
 				ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
 				if(clerk != null){
@@ -359,7 +360,7 @@ public class ClerkController extends WebBaseController{
 	//删除店员
 	@HttpLimit
 	@RequestMapping("/staff-del")
-	public HaobanResponse staffDel(String staffDepartmentRelatedIds,String wxEnterpriseId,String storeId,Integer version,String clerkIds,String staffId) {
+	public HaobanResponse staffDel(String wxEnterpriseId,String storeId,Integer version,String clerkIds,String staffId) {
 		if(version != null && version == 1){
 			AuditSettingDTO dto = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
 			if(dto.getClerkChangeFlag() == 1){