Merge branch 'master' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -277,6 +277,9 @@ public class StaffApiServiceImpl implements StaffApiService {
 	
 	@Override
 	public void cleanGicClerk(String code,String departmentId){
+		if (true) {
+			return;
+		}
 		if(StringUtils.isNotBlank(code)){
 			TabHaobanDepartment department = departmentService.selectById(departmentId);
 			String enterpriseId = "";

haoban-manage3-service/src/test/java/ServiceTest.java

@@ -88,15 +88,18 @@ public class ServiceTest {
 //        System.out.println(JSONObject.toJSONString(list));
 //    }
 //
-//    @Test
-//    public void addDepart() {
-//        DepartmentDTO dto = new DepartmentDTO();
-////		dto.set
-////		JSONResponse department = qywxDepartmentApiService.createDepartment("ww9ede832a84b7ae5f"
-////				, "ww7d6566614055cf27", null);
-////		List<DepartmentDTO> list = (List<DepartmentDTO>) department;
-////		System.out.println(JSONObject.toJSONString(list));
-//    }
+    @Test
+    public void addDepart() {
+        DepartmentDTO dto = new DepartmentDTO();
+		dto.setName("测试order");
+		dto.setOrder(2147484447L);
+		dto.setParentid(1);
+
+		JSONResponse department = qywxDepartmentApiService.createSelfDepartment("ww9ede832a84b7ae5f"
+				, "3aOw7jbcHlHkDmOi5TuG42Ta8NqskOhZxy5urrmaGl8", dto);
+//		List<DepartmentDTO> list = (List<DepartmentDTO>) department;
+		System.out.println(JSONObject.toJSONString(department));
+    }
 //
 //    @Test
 //    public void getUser() {