From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 980aa3e..150eaf3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -298,7 +298,11 @@
                         continue FLAG;
                     }
                 }
-                list.add(Integer.parseInt(s));
+                try {
+                    list.add(Integer.parseInt(s));
+                }catch (Exception e){
+                        e.printStackTrace();
+                }
             }
         }
         return list;
@@ -371,6 +375,7 @@
 
     @Override
     public List<DeviceRole> findList(DeviceRole deviceRole) {
+        deviceRole.setIsdeleted(Constants.ZERO);
         QueryWrapper<DeviceRole> wrapper = new QueryWrapper<>(deviceRole);
         return deviceRoleMapper.selectList(wrapper);
     }

--
Gitblit v1.9.3