Merge remote-tracking branch 'origin/master'

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java

@@ -133,7 +133,12 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 			 experttemp.setTopPic(sysUser.getAvatar());
 			 experttemp.setPhone(sysUser.getPhone());
 			 experttemp.setEmails(sysUser.getEmail());
+			 if (sysDepart!=null ){
 				 experttemp.setSsdep(sysDepart.getDepartName());
+			 }else{
+				 experttemp.setSsdep("暂无");
+			 }
+
 			 experttemp.setPsd(sysUser.getPassword());
 			 experttemp.setSepsd(sysUser.getPassword());
 		 });