fix

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

@@ -259,20 +259,20 @@ public class DepartmentContoller extends WebBaseController{
 		if(RedisUtil.getCache(key) != null){
 			return resultResponse(HaoBanErrCode.ERR_10011);
 		}
-		List<DepartmentEditQO> editDepartmentList = null;
-		List<DepartmentAddQO> addDepartmentList = null;
+		Object editDepartmentObject = null;
+		Object addDepartmentObject = null;
 		String editDepartment = "";
 		String addDepartment = "";
-		
+		String delDepartmentIds = "";
 		logger.info("【部门同步】args={}",JSON.toJSONString(args));
 		if(args != null){
-			editDepartmentList = args.getEditDepartment();
-			addDepartmentList = args.getAddDepartment();
-			editDepartment = JSON.toJSONString(editDepartmentList);
-			addDepartment = JSON.toJSONString(addDepartmentList);
+			editDepartmentObject = args.getEditDepartment();
+			addDepartmentObject = args.getAddDepartment();
+			editDepartment = JSON.toJSONString(editDepartmentObject);
+			addDepartment = JSON.toJSONString(addDepartmentObject);
 		}
 		RedisUtil.setCache(key,1,3600l);
-		new SyncDepartmentThread(this,editDepartment,"",addDepartment,key).start();
+		new SyncDepartmentThread(this,editDepartment,delDepartmentIds,addDepartment,key).start();
 //		if(StringUtils.isNotBlank(addDepartment)) {
 //			List<DepartmentAddQO> list = JSONArray.parseArray(addDepartment, DepartmentAddQO.class);
 //			int sort = 0;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/SyncDepartmentQO.java

 package com.gic.haoban.manage.web.qo;
 
 import java.io.Serializable;
-import java.util.List;
 
 public class SyncDepartmentQO implements Serializable{
 	
-	private List<DepartmentEditQO> editDepartment;
+	private Object editDepartment;
 	
-	private List<DepartmentAddQO> addDepartment;
+	private Object addDepartment;
 
-	public List<DepartmentEditQO> getEditDepartment() {
+	public Object getEditDepartment() {
 		return editDepartment;
 	}
 
-	public void setEditDepartment(List<DepartmentEditQO> editDepartment) {
+	public void setEditDepartment(Object editDepartment) {
 		this.editDepartment = editDepartment;
 	}
 
-	public List<DepartmentAddQO> getAddDepartment() {
+	public Object getAddDepartment() {
 		return addDepartment;
 	}
 
-	public void setAddDepartment(List<DepartmentAddQO> addDepartment) {
+	public void setAddDepartment(Object addDepartment) {
 		this.addDepartment = addDepartment;
 	}
 
 	
 
-
 }