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 6b3d551..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 @@ -101,7 +101,11 @@ public class ExpertController extends JeecgController { 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()); }); @@ -133,7 +137,12 @@ public class ExpertController extends JeecgController { 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()); }); @@ -187,7 +196,11 @@ public class ExpertController extends JeecgController { 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); @@ -232,7 +245,11 @@ public class ExpertController extends JeecgController { 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); @@ -262,7 +279,11 @@ public class ExpertController extends JeecgController { 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); @@ -775,7 +796,11 @@ public class ExpertController extends JeecgController { 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()); diff --git a/jeecgboot-vue3/src/views/dashboard/workbench/components/ProjectCard.vue b/jeecgboot-vue3/src/views/dashboard/workbench/components/ProjectCard.vue index 725f02a..e6d36b6 100644 --- a/jeecgboot-vue3/src/views/dashboard/workbench/components/ProjectCard.vue +++ b/jeecgboot-vue3/src/views/dashboard/workbench/components/ProjectCard.vue @@ -21,7 +21,7 @@
请假{{ item5 }}人 出差{{ item6 }}人 - 出差{{ item7 }}人 + 其他{{ item7 }}人