修改bug

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xunmei.core.access.service.impl;
 
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -81,11 +82,13 @@ public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreM
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("task_id", coreMonitoringTaskRegistration.getTaskId());
         queryWrapper.eq("del_flag", 0);
-        CoreMonitoringTaskRegistration coreMonitoringTaskRegistration1 = baseMapper.selectOne(queryWrapper);
-        if (null != coreMonitoringTaskRegistration1) {
+        List<CoreMonitoringTaskRegistration>list = baseMapper.selectList(queryWrapper);
+
+        if (CollectionUtils.isNotEmpty(list)) {
             if (StringUtils.isEmpty(coreMonitoringTaskRegistration.getEndNfc()) && StringUtils.isEmpty(coreMonitoringTaskRegistration.getEndPicture())) {
                 throw new ServiceException("请勿重复扫描");
             }
+            CoreMonitoringTaskRegistration coreMonitoringTaskRegistration1 = list.get(0);
             coreMonitoringTaskRegistration1.setEndPicture(coreMonitoringTaskRegistration.getEndPicture());
             coreMonitoringTaskRegistration1.setEndNfc(coreMonitoringTaskRegistration.getEndNfc());
             return baseMapper.updateById(coreMonitoringTaskRegistration1);

soc-modules/soc-modules-file/pom.xml

@@ -61,6 +61,7 @@
             <artifactId>hutool-all</artifactId>
         </dependency>
 
+       
 
         <dependency>
             <groupId>com.lowagie</groupId>
@@ -69,7 +70,6 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/resources/lib/itext-4.2.1.jar</systemPath>
         </dependency>
-
     </dependencies>
 
     <build>

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/ISysFileService.java

@@ -3,6 +3,7 @@ package com.xunmei.file.service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.util.Map;
 
 /**

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java

@@ -34,7 +34,6 @@ import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.Map;
-
 /**
  * 本地文件存储
  *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysDeviceService.java

@@ -1,5 +1,6 @@
 package com.xunmei.system.service;
 
+import java.io.File;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeviceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.system.service.impl;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysAreaCheckMapper.xml

@@ -77,6 +77,7 @@
         LEFT JOIN sys_area sa ON sa.id = sac.area_id
         LEFT JOIN sys_org so ON so.id = sac.org_id
         where 1=1
+       and sac.del_flag='0'
         <if test="sysAreaCheck.checkName !=null">
             and check_name like concat('%', #{sysAreaCheck.checkName}, '%')
         </if>

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysNfcBindMapper.xml

@@ -176,6 +176,9 @@
             <if test="checkId != null">check_id =
                 #{checkId},
             </if>
+            <if test="delFlag !=null">
+              del_flag= #{delFlag}
+            </if>
         </trim>
         where id = #{id}
     </update>