From de102f8c7ec3676267c080e4240fdae8f3982007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sun, 10 Nov 2024 20:17:44 +0800
Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expert/controller/ExpertController.java   | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
index 8a75922..86d98f5 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
@@ -196,7 +196,11 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 			 experttemp.setTopPic(sysUser.getAvatar());
 			 experttemp.setPhone(sysUser.getPhone());
 			 experttemp.setEmails(sysUser.getEmail());
-			 experttemp.setSsdep(sysDepart.getDepartName());
+			 if (sysDepart!=null ){
+				 experttemp.setSsdep(sysDepart.getDepartName());
+			 }else{
+				 experttemp.setSsdep("暂无");
+			 }
 			 experttemp.setPsd(sysUser.getPassword());
 		 });
 		 return Result.OK(pageList);
@@ -241,7 +245,11 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 				 experttemp.setTopPic(sysUser.getAvatar());
 				 experttemp.setPhone(sysUser.getPhone());
 				 experttemp.setEmails(sysUser.getEmail());
-				 experttemp.setSsdep(sysDepart.getDepartName());
+				 if (sysDepart!=null ){
+					 experttemp.setSsdep(sysDepart.getDepartName());
+				 }else{
+					 experttemp.setSsdep("暂无");
+				 }
 				 experttemp.setPsd(sysUser.getPassword());
 			 });
 			 return Result.OK(pageList);
@@ -271,7 +279,11 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 			 experttemp.setTopPic(sysUser.getAvatar());
 			 experttemp.setPhone(sysUser.getPhone());
 			 experttemp.setEmails(sysUser.getEmail());
-			 experttemp.setSsdep(sysDepart.getDepartName());
+			 if (sysDepart!=null ){
+				 experttemp.setSsdep(sysDepart.getDepartName());
+			 }else{
+				 experttemp.setSsdep("暂无");
+			 }
 			 experttemp.setPsd(sysUser.getPassword());
 		 });
 		 return Result.OK(pageList);
@@ -784,7 +796,11 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 			 experttemp.setTopPic(sysUser.getAvatar());
 			 experttemp.setPhone(sysUser.getPhone());
 			 experttemp.setEmails(sysUser.getEmail());
-			 experttemp.setSsdep(sysDepart.getDepartName());
+			 if (sysDepart!=null ){
+				 experttemp.setSsdep(sysDepart.getDepartName());
+			 }else{
+				 experttemp.setSsdep("暂无");
+			 }
 			 experttemp.setPsd(sysUser.getPassword());
 			 experttemp.setSepsd(sysUser.getPassword());
 			 experttemp.setAvatar(sysUser.getAvatar());