diff --git a/kernel-d-scanner/scanner-spring-boot-starter/pom.xml b/kernel-d-scanner/scanner-spring-boot-starter/pom.xml
index 261f228cc..997dc4d12 100644
--- a/kernel-d-scanner/scanner-spring-boot-starter/pom.xml
+++ b/kernel-d-scanner/scanner-spring-boot-starter/pom.xml
@@ -24,6 +24,12 @@
${roses.version}
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+
+
diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/home/HomeCompanyInfo.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/home/HomeCompanyInfo.java
index ef9845213..8dcaf41d1 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/home/HomeCompanyInfo.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/home/HomeCompanyInfo.java
@@ -12,27 +12,27 @@ import lombok.Data;
public class HomeCompanyInfo {
/**
- * 组织机构数
+ * 所有组织机构数
*/
private Integer organizationNum;
/**
- * 企业人员总数
+ * 所有企业人员总数
*/
- private Integer enterprisePersonnelNum;
+ private Integer enterprisePersonNum;
/**
- * 职位总数
+ * 所有职位总数
*/
private Integer positionNum;
/**
- * 部门总数
+ * 当前登录用户,所在公司的部门数量
*/
- private Integer sectionNum;
+ private Integer currentDeptNum;
/**
- * 公司人员总数
+ * 当前登录用户,所在公司的总人数
*/
- private Integer companyPersonnelNum;
+ private Integer currentCompanyPersonNum;
}
diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java
index 59c47b352..e256ffcdf 100644
--- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java
+++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java
@@ -108,7 +108,7 @@ public class HomePageServiceImpl extends ServiceImpl allUserIdList = userServiceApi.queryAllUserIdList(sysUserRequest);
- homeCompanyInfo.setEnterprisePersonnelNum(allUserIdList.size());
+ homeCompanyInfo.setEnterprisePersonNum(allUserIdList.size());
// 获取职位总数
int positionNum = positionServiceApi.PositionNum();
@@ -116,10 +116,11 @@ public class HomePageServiceImpl extends ServiceImpl sysUserOrgs = sysUserOrgService.list(Wrappers.lambdaQuery().eq(SysUserOrg::getOrgId, organizationId));
- homeCompanyInfo.setCompanyPersonnelNum(sysUserOrgs.size());
+ homeCompanyInfo.setCurrentCompanyPersonNum(sysUserOrgs.size());
// 设置公司部门数
int sectionNum = 0;
@@ -131,7 +132,7 @@ public class HomePageServiceImpl extends ServiceImpl