Merge remote-tracking branch 'origin/V1' into V1

common/src/main/resources/mapper/base/DeviceInfo.xml

@@ -127,7 +127,7 @@ id_, header_,device_no,alias_name,address_,is_online,company_id,unlock_password,
 	</select>
 	<select id="getByDeviceNo" parameterType="string" resultMap="DeviceInfoMap">
 		select
-id_, header_,device_no,alias_name,address_,is_online,company_id,unlock_password,code_address,ip_address,port_,type_,is_auto_update,del_flag,create_by,create_time,update_by,update_time,default_face_library_id		from base_device_info where device_no=#{0}
+id_, header_,device_no,alias_name,address_,is_online,company_id,unlock_password,code_address,ip_address,port_,type_,is_auto_update,del_flag,create_by,create_time,update_by,update_time,default_face_library_id		from base_device_info where device_no=#{0} and del_flag=false
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_device_info where id_=#{0} and  del_flag=false

web/src/main/java/com/jpsoft/smart/modules/base/controller/DeviceInfoController.java

@@ -70,7 +70,6 @@ public class DeviceInfoController {
         }
         catch(Exception ex){
             logger.error(ex.getMessage(),ex);
-
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
         }
@@ -125,31 +124,35 @@ public class DeviceInfoController {
         try {
             DeviceInfo item = deviceInfoService.getByDeviceNo(deviceInfo.getDeviceNo());
 
-            //如果修改自己的属性
-            if(item.getId().equals(deviceInfo.getId())){
-                deviceInfo.setUpdateBy(subject);
-                deviceInfo.setUpdateTime(new Date());
-
-                int affectCount = deviceInfoService.update(deviceInfo);
-
-                if (affectCount > 0) {
-                    msgResult.setResult(true);
-                    msgResult.setData(deviceInfo);
+            if(item!=null) {
+                //如果修改自己的属性
+                if (item.getId().equals(deviceInfo.getId())) {
+                    deviceInfo.setUpdateBy(subject);
+                    deviceInfo.setUpdateTime(new Date());
+
+                    int affectCount = deviceInfoService.update(deviceInfo);
+
+                    if (affectCount > 0) {
+                        msgResult.setResult(true);
+                        msgResult.setData(deviceInfo);
+                    } else {
+                        msgResult.setResult(false);
+                        msgResult.setMessage("数据库更新失败");
+                    }
                 } else {
+                    //如果修改设备编号在数据库中已有重复的设备号，则不能修改！
                     msgResult.setResult(false);
-                    msgResult.setMessage("数据库更新失败");
+                    msgResult.setMessage("该设备编号的设备已存在，不能修改！");
                 }
             }
             else{
-                //如果修改设备编号在数据库中已有重复的设备号，则不能修改！
                 msgResult.setResult(false);
-                msgResult.setMessage("该设备编号的设备已存在，不能修改！");
+                msgResult.setMessage("该设备不存在！");
             }
 
         }
         catch(Exception ex){
             logger.error(ex.getMessage(),ex);
-
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
         }