Merge branch 'dev' into docker_package

renren-admin/src/main/java/io/renren/common/controller/CensusController.java

@@ -218,8 +218,10 @@ public class CensusController {
                                     {
                                         put("provide", type);
                                         put("deptId", deptId);
+                                        if (deptDTO != null) {
                                             put("deptName", deptDTO.getName());
                                         }
+                                    }
                                 });
                             });
                     return task;