From 25803e31e0ab055aa754ba5f59d243a307074374 Mon Sep 17 00:00:00 2001 From: liuhuazhong Date: Fri, 9 May 2025 09:50:23 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix=20=E3=80=90=E8=B5=84=E6=BA=90=E5=BA=93-?= =?UTF-8?q?=E6=88=90=E6=9E=9C=E7=AE=A1=E7=90=86=E3=80=91=E7=AB=9E=E4=BA=89?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=90=8D=E7=A7=B0=E6=8B=BC=E6=8E=A5=20?= =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=90=8D=E7=A7=B0+=E5=8F=82=E8=B5=9B?= =?UTF-8?q?=E9=98=9F=E9=95=BF=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/CompetitionResourceLibrary.java | 18 ++++++++++++++++++ .../domain/ProjectResourceLibrary.java | 9 +++++++++ .../dms/CompetitionResourceLibraryMapper.xml | 2 ++ .../dms/ProjectResourceLibraryMapper.xml | 10 ++++++++-- .../mapper/dms/TaskResourceLibraryMapper.xml | 2 +- 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/CompetitionResourceLibrary.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/CompetitionResourceLibrary.java index ddf23aacd..f67ef6ed1 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/CompetitionResourceLibrary.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/CompetitionResourceLibrary.java @@ -95,6 +95,24 @@ public class CompetitionResourceLibrary extends BaseEntity { * 附件 */ private String attachment; + private String leader; + private String identifier; + + public String getIdentifier() { + return identifier; + } + + public void setIdentifier(String identifier) { + this.identifier = identifier; + } + + public String getLeader() { + return leader; + } + + public void setLeader(String leader) { + this.leader = leader; + } private List> attachmentList = new ArrayList<>(); diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ProjectResourceLibrary.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ProjectResourceLibrary.java index 6c7b26657..42acbbace 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ProjectResourceLibrary.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ProjectResourceLibrary.java @@ -25,6 +25,7 @@ public class ProjectResourceLibrary extends BaseEntity { private String projectDomainName; // private String identifier; + private String userIdentifier; //开源项目ID private Long projectId; //仓库ID @@ -65,6 +66,14 @@ public class ProjectResourceLibrary extends BaseEntity { private String attachments; private List> attachmentList = new ArrayList<>(); + public String getUserIdentifier() { + return userIdentifier; + } + + public void setUserIdentifier(String userIdentifier) { + this.userIdentifier = userIdentifier; + } + public String getProjectDomain() { return projectDomain; } diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml index 2779c0100..ca9d94fd2 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml @@ -136,6 +136,8 @@ cu.sub_item as submission_summary, cu.sub_item as submission_details, cu.leader as contact_person, + cu.leader as leader, + ci.identifier as identifier, cu.phone as contact_phone, is_transferred_to_result_library, transferred_to_result_library_time, diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml index fc27bd3a3..f026eddcf 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml @@ -125,6 +125,7 @@ + @@ -151,7 +152,7 @@ create_by, create_time, update_by, - update_time + update_time,project_domain from project_resource_library @@ -167,7 +168,8 @@ v.name as release_name, v.updated_at as release_date, (select login from users where id=v.user_id) as release_person, - p.project_category_id as project_domain, + (select login from users where id=v.user_id) as user_identifier, + IFNULL(pl.project_domain,p.project_category_id) as project_domain, pl.release_type, pl.release_unit, p.description as release_summary, @@ -209,6 +211,7 @@ and is_selected_achievement = #{isSelectedAchievement} and images = #{images} and attachments = #{attachments} + and project_domain = #{projectDomain} order by is_transferred_to_achievement @@ -245,6 +248,7 @@ create_time, update_by, update_time, + project_domain, @@ -270,6 +274,7 @@ #{createTime}, #{updateBy}, #{updateTime}, + #{projectDomain}, @@ -300,6 +305,7 @@ create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + project_domain = #{projectDomain}, where id = #{id} diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml index 9d1ee8b62..48c90d08d 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml @@ -443,7 +443,7 @@ t.id as task_id, pd.paper_id as paper_id, t.name as task_name, - t.category_id as task_domain, + IFNULL(ts.task_domain, t.category_id) as task_domain, t.bounty as task_amount, p.number as submission_name, p.created_at as submission_date, From 93dd90fc474107165013ce102706ee417a770a31 Mon Sep 17 00:00:00 2001 From: liuhuazhong Date: Fri, 9 May 2025 10:07:33 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix=20=E3=80=90=E8=B5=84=E6=BA=90=E5=BA=93-?= =?UTF-8?q?=E6=88=90=E6=9E=9C=E7=AE=A1=E7=90=86=E3=80=91=E4=BC=98=E8=B4=A8?= =?UTF-8?q?=E4=B8=93=E5=AE=B6=E8=B5=84=E6=BA=90=E5=BA=93=E4=B8=80=E7=B3=BB?= =?UTF-8?q?=E5=88=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resourceLibrary/domain/ExpertResourceLibrary.java | 9 +++++++++ .../service/impl/ExpertResourceLibraryServiceImpl.java | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ExpertResourceLibrary.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ExpertResourceLibrary.java index 50186b9d3..9841e3550 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ExpertResourceLibrary.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ExpertResourceLibrary.java @@ -76,6 +76,15 @@ public class ExpertResourceLibrary extends BaseEntity { private String userImg; private String userNickName; + private String otherAttachments; + + public String getOtherAttachments() { + return otherAttachments; + } + + public void setOtherAttachments(String otherAttachments) { + this.otherAttachments = otherAttachments; + } public String getUserImg() { return userImg; diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/impl/ExpertResourceLibraryServiceImpl.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/impl/ExpertResourceLibraryServiceImpl.java index 1784b7ada..1100963c6 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/impl/ExpertResourceLibraryServiceImpl.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/impl/ExpertResourceLibraryServiceImpl.java @@ -1,5 +1,6 @@ package com.microservices.dms.resourceLibrary.service.impl; +import com.alibaba.fastjson.JSON; import com.microservices.common.core.utils.DateUtils; import com.microservices.common.core.utils.StringUtils; import com.microservices.dms.behaviorImage.domain.AchievementBehaviorSumVo; @@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -37,6 +39,7 @@ public class ExpertResourceLibraryServiceImpl implements IExpertResourceLibraryS */ @Override public ExpertResourceLibrary selectExpertResourceLibraryById(Long id) { + List> mmp = new ArrayList<>(); ExpertResourceLibrary res = expertResourceLibraryMapper.selectExpertResourceLibraryById(id); ExpertAttachmentVo attachmentVo = expertResourceLibraryMapper.getExpertInfoById(res.getExpertId()); Map honorsAttachments = expertResourceLibraryMapper.getAttachmentInfo(attachmentVo.getHonorsAttachments()); @@ -51,6 +54,11 @@ public class ExpertResourceLibraryServiceImpl implements IExpertResourceLibraryS res.getParams().put("honorsAttachments", honorsAttachments); res.getParams().put("resumeAttachments", resumeAttachments); res.getParams().put("titleCertificateAttachments", titleCertificateAttachments); + mmp.add(academicAchievementsAttachments); + mmp.add(honorsAttachments); + mmp.add(resumeAttachments); + mmp.add(titleCertificateAttachments); + res.setOtherAttachments(JSON.toJSONString(mmp)); return res; } From 10a520bf98e702d4ea7227bdb845f4c2aa630720 Mon Sep 17 00:00:00 2001 From: liuhuazhong Date: Fri, 9 May 2025 11:21:25 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix=20=E3=80=90=E8=B5=84=E6=BA=90=E5=BA=93-?= =?UTF-8?q?=E6=88=90=E6=9E=9C=E7=AE=A1=E7=90=86=E3=80=91=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BC=98=E8=B4=A8=E4=B8=93=E5=AE=B6=E6=97=B6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dms/CompetitionResourceLibraryMapper.xml | 4 ++-- .../dms/ExpertResourceLibraryMapper.xml | 24 +++++++++---------- .../dms/ProjectResourceLibraryMapper.xml | 3 +++ .../mapper/dms/TaskResourceLibraryMapper.xml | 4 ++-- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml index ca9d94fd2..e1457d782 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml @@ -133,8 +133,8 @@ cu.leader as submitter, submission_type, cu.org_name as submitting_unit, - cu.sub_item as submission_summary, - cu.sub_item as submission_details, + IFNULL(crl.submission_summary,cu.sub_item) as submission_summary, + IFNULL(crl.submission_details,cu.sub_item) as submission_details, cu.leader as contact_person, cu.leader as leader, ci.identifier as identifier, diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml index 30d8bad0b..530bacaa8 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml @@ -79,8 +79,8 @@ expert_domain,u.authentication as expertAuth, e.title_rank, erl.status, e.review_area_one, e.review_area_two, e.review_area_three, e.is_delete, erl.create_by, erl.create_time, - (select COUNT(*) from task_expert where expert_id = e.id and container_type = 1) as taskAuditCount, - (select COUNT(*) from task_expert where expert_id = e.id and container_type = 2) as competitionAuditCount, + (select COUNT(*) from task_expert where expert_id = e.id and container_type = 1 and `status` in (1,2)) as taskAuditCount, + (select COUNT(*) from task_expert where expert_id = e.id and container_type = 2 and `status` in (1,2)) as competitionAuditCount, erl.update_by, erl.update_time,erl.sort_no from experts e inner join users u on e.user_id = u.id @@ -126,8 +126,8 @@ expert_domain,images, attachments, e.title_rank, erl.status, e.review_area_one, e.review_area_two, e.review_area_three, e.is_delete, erl.create_by, erl.create_time, - (select COUNT(*) from task_expert where expert_id = e.id and container_type = 1) as taskAuditCount, - (select COUNT(*) from task_expert where expert_id = e.id and container_type = 2) as competitionAuditCount, + (select COUNT(*) from task_expert where expert_id = e.id and container_type = 1 and `status` in (1,2)) as taskAuditCount, + (select COUNT(*) from task_expert where expert_id = e.id and container_type = 2 and `status` in (1,2)) as competitionAuditCount, (select count(*) as watchSum from watchers where watchable_type = 'Experts' and watchable_id = erl.id) as watcherSum, (select count(*) as favoriteSum from favorites where favorite_type = 'Experts' and favorite_id = erl.id) as favoriteSum, erl.update_by, erl.update_time,erl.sort_no @@ -167,11 +167,11 @@ @@ -423,11 +423,11 @@ tmp.competitionAuditCount as "competitionAuditSum", (tmp.taskAuditCount + tmp.competitionAuditCount) as "total" from (select e.expert_name, - (select COUNT(*) from task_expert where expert_id = e.id and container_type = 1) as taskAuditCount, + (select COUNT(*) from task_expert where expert_id = e.id and container_type = 1 and `status` in (1,2)) as taskAuditCount, (select COUNT(*) from task_expert where expert_id = e.id - and container_type = 2) as competitionAuditCount + and container_type = 2 and `status` in (1,2)) as competitionAuditCount from experts e inner join users u on e.user_id = u.id left join expert_resource_library erl on e.id = erl.user_id diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml index f026eddcf..cf9729b5d 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml @@ -172,6 +172,9 @@ IFNULL(pl.project_domain,p.project_category_id) as project_domain, pl.release_type, pl.release_unit, + v.body, + IFNULL( pl.release_summary,v.body) as release_summary, + IFNULL( pl.release_details,v.body) as release_details, p.description as release_summary, p.description as release_details, pl.contact_person, diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml index 48c90d08d..5bd74ecab 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml @@ -450,8 +450,8 @@ (select u.login from users u where u.id = p.user_id) as submitter_name, submission_type, submission_organization, - pd.content as submission_summary, - pd.content as release_details, + IFNULL(ts.submission_summary,pd.content) as submission_summary, + IFNULL(ts.release_details,pd.content) as release_details, t.contact_name, t.contact_phone, is_transferred_to_results_library, From 3270ae7cddf0855a697cb7e10fbed98e8f2d02f6 Mon Sep 17 00:00:00 2001 From: liuhuazhong Date: Fri, 9 May 2025 14:27:30 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix=20=E3=80=90=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E3=80=91=E7=AB=9E=E8=B5=9B=E6=88=90=E6=9E=9C=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/TaskResourceLibraryMapper.java | 2 +- .../service/TaskResourceLibraryService.java | 2 +- .../resources/mapper/dms/AchievementsMapper.xml | 8 ++++---- .../mapper/dms/ExpertResourceLibraryMapper.xml | 16 ++++++++-------- .../mapper/dms/TaskResourceLibraryMapper.xml | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/TaskResourceLibraryMapper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/TaskResourceLibraryMapper.java index f88455e04..4737100f4 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/TaskResourceLibraryMapper.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/TaskResourceLibraryMapper.java @@ -92,7 +92,7 @@ public interface TaskResourceLibraryMapper { * * @return 任务金额 */ - long getTaskAmount(); + Double getTaskAmount(); /** * 获取需评审任务数 diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/TaskResourceLibraryService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/TaskResourceLibraryService.java index 573829b8f..ef16e8fe3 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/TaskResourceLibraryService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/TaskResourceLibraryService.java @@ -166,7 +166,7 @@ public class TaskResourceLibraryService { * * @return 任务金额 */ - public Long getTaskAmount() { + public Double getTaskAmount() { return taskResourceLibraryMapper.getTaskAmount(); } diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml index eed37323c..8580dd590 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml @@ -357,17 +357,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml index 530bacaa8..32d1edcad 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml @@ -126,8 +126,8 @@ expert_domain,images, attachments, e.title_rank, erl.status, e.review_area_one, e.review_area_two, e.review_area_three, e.is_delete, erl.create_by, erl.create_time, - (select COUNT(*) from task_expert where expert_id = e.id and container_type = 1 and `status` in (1,2)) as taskAuditCount, - (select COUNT(*) from task_expert where expert_id = e.id and container_type = 2 and `status` in (1,2)) as competitionAuditCount, + (select COUNT(distinct container_id) from task_expert where expert_id = e.id and container_type = 1 and `status` in (1,2)) as taskAuditCount, + (select COUNT(distinct container_id) from task_expert where expert_id = e.id and container_type = 2 and `status` in (1,2)) as competitionAuditCount, (select count(*) as watchSum from watchers where watchable_type = 'Experts' and watchable_id = erl.id) as watcherSum, (select count(*) as favoriteSum from favorites where favorite_type = 'Experts' and favorite_id = erl.id) as favoriteSum, erl.update_by, erl.update_time,erl.sort_no @@ -167,8 +167,8 @@ select IFNULL(SUM(competitionAuditCount), 0) - from (select (select COUNT(*) + from (select (select COUNT(distinct container_id) from task_expert where expert_id = e.id and container_type = 2 and `status` in (1,2)) as competitionAuditCount from experts e) tmp @@ -540,7 +540,7 @@ - select IFNULL(sum(t.bounty), 0) from tasks t join (select distinct task_id from papers where status = 2) p on t.id = p.task_id From 677fb671bbfebabdf3e28d2d026b466c799f8f50 Mon Sep 17 00:00:00 2001 From: liuhuazhong Date: Fri, 9 May 2025 16:54:21 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix=20=E3=80=90=E8=B5=84=E6=BA=90=E5=BA=93-?= =?UTF-8?q?=E6=A0=A1=E4=BC=81=E6=88=90=E6=9E=9C=E3=80=91=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=9B=E5=BB=BA=E4=BA=BA=EF=BC=8C=E6=A0=A1?= =?UTF-8?q?=E4=BC=81=E6=88=90=E6=9E=9C=E5=88=97=E8=A1=A8=E4=BB=85=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=82=E5=90=8E=E5=8F=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SchoolEnterpriseAchievementsServiceImpl.java | 10 +++++----- .../main/resources/mapper/dms/AchievementsMapper.xml | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java index cd7a47e4a..25b1c4ce7 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java @@ -61,11 +61,11 @@ public class SchoolEnterpriseAchievementsServiceImpl implements ISchoolEnterpris @Override public List selectSchoolEnterpriseAchievementsList(SchoolEnterpriseAchievements schoolEnterpriseAchievements) { - LoginUser loginUser = SecurityUtils.getLoginUser(); - if (loginUser != null){ - String username = loginUser.getUsername(); - schoolEnterpriseAchievements.setCreateBy(username); - } +// LoginUser loginUser = SecurityUtils.getLoginUser(); +// if (loginUser != null){ +// String username = loginUser.getUsername(); +// schoolEnterpriseAchievements.setCreateBy(username); +// } List list = schoolEnterpriseAchievementsMapper.selectSchoolEnterpriseAchievementsList(schoolEnterpriseAchievements); for (SchoolEnterpriseAchievements a : list) { a.setImages(achievementsService.buildFileInfoByIdents(a.getImages(), "4")); diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml index 8580dd590..365e79f64 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml @@ -77,10 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"