Merge branch 'V0.1.1_alarm' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.1.1_alarm

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

@@ -126,7 +126,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
     @Override
     public SysDevice selectSysDeviceById(Long id) {
         SysDevice sysDevice = sysDeviceMapper.selectById(id);
-        if (ObjectUtil.equal(sysDevice.getDeviceType(), "1")) {
+        if (ObjectUtil.equal(sysDevice.getDeviceType(), "6")) {
             ProtectionVO byDeviceId = remoteProtectionService.getByDeviceId(id, SecurityConstants.INNER);
             if (byDeviceId != null) {
                 sysDevice.setInBook(byDeviceId.getInBook());
@@ -302,7 +302,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
         /**
          * 这块逻辑代码，上层出错时，会导致新增设备出错
          */
-        if (sysDevice.getDeviceType().equals("1")) {
+        if (sysDevice.getDeviceType().equals("6")) {
             ProtectionDTO protectionDTO = new ProtectionDTO();
             protectionDTO.setName(sysDevice.getDeviceName());
             protectionDTO.setOrgPath(sysOrg.getPath());