From bda0c939149c90f12542c910caff020fd4caf088 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Fri, 18 Apr 2025 16:36:20 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=9D=83=E9=99=90=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceProServiceImpl.java    | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java
index 3b5a0ae..eb26d1a 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java
@@ -111,15 +111,13 @@ public class DeviceProServiceImpl implements IDeviceProService  {
 
         List<DeviceEntity> deviceEntityList = deviceMapper.selectList(new LambdaQueryWrapper<DeviceEntity>().in(DeviceEntity::getProId, ids));
 
-        if (ObjectUtil.isNotEmpty(deviceEntityList)) {
-            throw new ServiceException("该项目已绑定设备,无法删除,请联系管理员!");
-        }
+        deviceEntityList.forEach(deviceEntity -> {
+            deviceMapper.updatePor(deviceEntity.getId(),null);
+        });
 
-        List<DeviceProUserEntity> proUserEntityList = deviceProUserMapper.selectList(new LambdaQueryWrapper<DeviceProUserEntity>().in(DeviceProUserEntity::getDeviceProId, ids));
 
-        if (ObjectUtil.isNotEmpty(proUserEntityList)) {
-            throw new ServiceException("该项目已绑定人员,无法删除,请联系管理员!");
-        }
+        //todo人员是否要删除
+        List<DeviceProUserEntity> proUserEntityList = deviceProUserMapper.selectList(new LambdaQueryWrapper<DeviceProUserEntity>().in(DeviceProUserEntity::getDeviceProId, ids));
 
 
         return deviceProMapper.deleteByIds(ids)>0;
@@ -128,15 +126,14 @@ public class DeviceProServiceImpl implements IDeviceProService  {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateDeviceProUser(List<DeviceProUserEntity> userEntity,Long proId) {
-        if (ObjectUtil.isNotEmpty(userEntity)) {
-            throw new ServiceException("参数为空!");
-        }
-
         try {
-
+            //先清除原来的项目组成员
             deviceProUserMapper.delete(new LambdaQueryWrapper<DeviceProUserEntity>().eq(DeviceProUserEntity::getDeviceProId, proId));
 
-            deviceProUserMapper.insert(userEntity);
+            if (ObjectUtil.isNotEmpty(userEntity)) {
+                //添加新的项目组成员
+                deviceProUserMapper.insert(userEntity);
+            }
 
             return true;
         } catch (ServiceException e) {
@@ -167,6 +164,11 @@ public class DeviceProServiceImpl implements IDeviceProService  {
         return deviceMapper.update(wrapper) > 0;
     }
 
+    /**
+     * 获取当前成员所属项目组
+     * @param userId
+     * @return
+     */
     @Override
     public List<Integer> listDeviceGroup(Long userId) {
         LambdaQueryWrapper<DeviceProUserEntity> wrapper = new LambdaQueryWrapper<>();