From e7f35b7e5f0a7b8664d41700fbb54fb1a02489cf Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 24 二月 2026 10:29:38 +0800
Subject: [PATCH] 功能开发

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 5e1af2d..4ded361 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -333,7 +333,7 @@
                 .selectAll(Member.class)
                 .select(" c1.NAME ", Member::getPromotionName)
                 .select(" c2.NAME ", Member::getLevelName)
-                .select(" TIMESTAMPDIFF(YEAR, CONCAT(t.JOB_YEAR , '-01-01'), now()) ",Member::getWorkYears)
+//                .select(" TIMESTAMPDIFF(YEAR, CONCAT(t.JOB_YEAR , '-01-01'), now()) ",Member::getWorkYears)
                 .leftJoin(" category c1 on t.POSITON = c1.id ")
                 .leftJoin(" category c2 on t.LEVEL_ID = c2.id ")
                 .eq(Member::getId, id)
@@ -362,6 +362,11 @@
             dealMemberCategoryList(member, categoryList,Constants.ONE);
         }
 
+        if(member.getJobYear()!=null){
+            member.setWorkYears(DateUtil.getCurrentYear( ) - member.getJobYear()+1);
+        }
+
+
         String resourcePath = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode();
         String path =  systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER_FILES).getCode();
         member.setFullImgurl(StringUtils.isNotBlank(member.getImgurl())?(resourcePath  + path + member.getImgurl()):"");

--
Gitblit v1.9.3