1111

src/main/java/com/om/controller/admin/DeviceController.java

@@ -89,14 +89,21 @@ public class DeviceController {
     public Result update(@RequestBody Device device) {
         //根据id查询旧数据
         Device byId = deviceService.getById(device.getId());
-        if (!byId.getUsername().equals(device.getUsername())) {
-            LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(User::getUsername, byId.getUsername());
-            User user = userMapper.selectOne(queryWrapper);
-            user.setDeviceSn("");
-            user.setUpdateTime(LocalDateTime.now());
-            userMapper.updateById(user);
+        if (byId == null) {
+            throw new BadReqException("此设备信息不存在");
         }
+        if (StringUtils.isNotBlank(byId.getUsername())) {
+            if (!byId.getUsername().equals(device.getUsername())) {
+                LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(User::getUsername, byId.getUsername());
+                User user = userMapper.selectOne(queryWrapper);
+                user.setDeviceSn("");
+                user.setUpdateTime(LocalDateTime.now());
+                userMapper.updateById(user);
+            }
+
+        }
+
         if (StringUtils.isNotBlank(device.getUsername())) {
             LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(User::getUsername, device.getUsername());
@@ -105,6 +112,7 @@ public class DeviceController {
             user.setUpdateTime(LocalDateTime.now());
             userMapper.updateById(user);
         }
+
         deviceService.updateById(device);
         return Result.ok();
     }

src/main/java/com/om/controller/user/APPDiagnosticLogController.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 @RestController
 @Api(tags = "诊断日志相关接口")
-@RequestMapping("/web/diagnostic-log")
+@RequestMapping("/app/diagnostic-log")
 public class APPDiagnosticLogController {
 
     @Resource

src/main/java/com/om/service/impl/UserServiceImpl.java

@@ -505,7 +505,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (deviceSn != null && !deviceSn.isEmpty()) {
             Device one = deviceService.lambdaQuery()
                     .eq(Device::getDeviceSn, deviceSn)
-                    .eq(Device::getUsername,user.getUsername())
                     .one();
             if (BeanUtil.isEmpty(one)) {
                 throw new BadReqException("该平板设备不存在");