From 9c94f247bf843c9a838c1c6fcf576a2856ff34b6 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 18 Oct 2022 15:54:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BD=AE=E9=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProjectLibraryBaseMapper.xml      |  4 +++-
 .../impl/ProjectLibraryBaseServiceImpl.java      | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index ab571bf8d..3fa838a91 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -47,7 +47,9 @@
             plb.parent_id,
             plb.project_version,
             plb.explanation,
-            plb.software_version
+            plb.software_version,
+            plb.sort,
+            plb.flag
         from project_library_base as plb
         left join project_name_info as pni on  plb.project_name_id=pni.id
         left join sys_user as studiouser on plb.studio_engineer=studiouser.id
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 232ebfb7a..a359144a4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -2,6 +2,7 @@ package com.jero.modules.project.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
@@ -981,11 +982,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Override
 	public void top(String id, String flag) {
 		ProjectLibraryBase projectLibraryBase = this.getById(id);
+		//置顶的时候将取消置顶标识传过来即:flag=1
 		if(TopEnum.TOP_CANCEL.getValue().equals(flag)){
-			//取消置顶
-			projectLibraryBase.setSort(null);
-			projectLibraryBase.setFlag(null);
-		}else{
 			//置顶
 			LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
 			wrapper.isNotNull(ProjectLibraryBase::getSort).orderByDesc(ProjectLibraryBase::getSort);
@@ -995,11 +993,19 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				int sortTemp = Integer.valueOf(sort) + 1;
 				projectLibraryBase.setSort(String.valueOf(sortTemp));
 			}else{
+				//首个置顶的项目排序为1
 				projectLibraryBase.setSort("1");
 			}
 			projectLibraryBase.setFlag(TopEnum.TOP_CANCEL.getValue());
+			this.updateById(projectLibraryBase);
+
+		}else{
+			//取消置顶
+			LambdaUpdateWrapper<ProjectLibraryBase> updateWrapper = new LambdaUpdateWrapper<>();
+			updateWrapper.in(ProjectLibraryBase::getId,id);
+			updateWrapper.set(ProjectLibraryBase::getSort,null).set(ProjectLibraryBase::getFlag,null);
+			this.update(projectLibraryBase,updateWrapper);
 		}
-		this.updateById(projectLibraryBase);
 	}
 }