From dca3df57c2934bf7e18d80ede616fc70f9c93c92 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:09:52 +0800 Subject: [PATCH 1/4] =?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 --- .../modules/demo/expert/controller/ExpertController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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..b8e82a5 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 @@ -133,7 +133,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()); }); From a6349c22129854f5fb433dda508190c5b968fae1 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:14:31 +0800 Subject: [PATCH 2/4] =?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 --- .../modules/demo/expert/controller/ExpertController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 b8e82a5..8a75922 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()); }); 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 3/4] =?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 { 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 { 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 { 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 { 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()); From 5230ab409e088d67a336e2b34b6a6952590128f7 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:27:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/dashboard/workbench/components/ProjectCard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }}人