Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

tianhu-system/src/main/java/com/tianhu/system/controller/SysDeptController.java

@@ -201,7 +201,7 @@ public class SysDeptController extends BaseController
         dept.setAlternateNumber(alternateNumber);
         //TODO 通知审批流
         if(IS_APPROVAL){
-            Map<String, Object> resMap = flowableService.addFlowableGroup(dept);
+            Map<String, Object> resMap = flowableService.addFlowableGroup(dept.getAlternateNumber(), dept.getDeptName());
             if (!"200".equals(resMap.get("code"))) {
                 return AjaxResult.error(CommonUtil.objToString(resMap.get("message")));
             }
@@ -253,7 +253,7 @@ public class SysDeptController extends BaseController
         dept.setUpdateBy(SecurityUtils.getUsername());
         //TODO 通知审批流
         if(IS_APPROVAL){
-            Map<String, Object> resMap = flowableService.addFlowableGroup(dept);
+            Map<String, Object> resMap = flowableService.addFlowableGroup(dept.getAlternateNumber(), dept.getDeptName());
             if (!"200".equals(resMap.get("code"))) {
                 return AjaxResult.error(CommonUtil.objToString(resMap.get("message")));
             }

tianhu-system/src/main/java/com/tianhu/system/utils/FlowableService.java

@@ -36,21 +36,18 @@ public class FlowableService {
 		}
 		return resMap;
 	}
-	
-	
+
 	/**
 	 * 保存用户
-	 * @param staffInf
 	 * @return
 	 */
-//	public Map<String, Object> addFlowableUser(SysStaffInf	staffInf,String deptId) {
-//		Map<String, Object> m = new HashMap<>();
-//		m.put("id", staffInf.getSsId());
-//		m.put("name", staffInf.getSsName());
-//		m.put("companyId",staffInf.getSsCompanyId());
-//		m.put("groupId",deptId);
-//		return apiPost(ADD_USER, m);
-//	}
+	public Map<String, Object> addFlowableUser(String id, String name, String groupId) {
+		Map<String, Object> m = new HashMap<>();
+		m.put("id", id);
+		m.put("name", name);
+		m.put("groupId", groupId);
+		return apiPost(ADD_USER, m);
+	}
 	
 	/**
 	 * 删除用户
@@ -65,11 +62,10 @@ public class FlowableService {
 	 * 新增部门
 	 * @return
 	 */
-	public Map<String, Object> addFlowableGroup(SysDept dept) {
+	public Map<String, Object> addFlowableGroup(String groupId, String groupName) {
 		Map<String, Object> m = new HashMap<>();
-		m.put("groupId", dept.getAlternateNumber());
-		m.put("groupName",dept.getDeptName());
-		m.put("companyId",dept.getCompanyId());
+		m.put("groupId", groupId);
+		m.put("groupName", groupName);
 		return apiPost(ADD_GROUP, m);
 	}