修改解锁bug

blade-service/blade-client/src/main/java/org/springblade/client/lock/controller/LockController.java

@@ -160,20 +160,21 @@ public class LockController extends BladeController {
 			.eq(Lock::getTableName,tableName)
 			.eq(Lock::getTenantId,AuthUtil.getTenantId());
 		Lock lock = lockService.getOne(lockLambdaQueryWrapper, false);
+		Long userId = AuthUtil.getUserId();
 		//没有锁
         if(lock==null)
         {
 			return R.success("目前订单可以编辑");
         }
-        //有锁 不是自己
-        else if(lock!=null && lock.getUserId()!=AuthUtil.getUserId())
+		//有锁 不是自己
+        else if( lock.getUserId().longValue()!=userId.longValue())
         {
 			SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
 
 			return R.fail("账号:"+lock.getRealName()+"于"+simpleDateFormat.format(lock.getLockTime())+"正在编辑请稍后再试!");
 		}
         //有锁 是自己
-		else if(lock!=null && lock.getUserId()==AuthUtil.getUserId())
+		else if( lock.getUserId().longValue()==userId.longValue())
 		{
 			return R.success("目前订单可以编辑");
 		}
@@ -206,12 +207,12 @@ public class LockController extends BladeController {
 		{
 			Lock lock = lockService.getOne(lockLambdaQueryWrapper, false);
 			//存在自己的锁
-			if(lock.getUserId()==AuthUtil.getUserId())
+			if(lock.getUserId().longValue()==AuthUtil.getUserId().longValue())
 			{
 				 return R.success("OK");
 			}
 			//存在别人的锁, 直接报错
-			else if(lock.getUserId()!=AuthUtil.getUserId())
+			else if(lock.getUserId().longValue()!=AuthUtil.getUserId().longValue())
 			{
 				return R.fail("上锁失败:存在其他用户的锁");
 			}