Merge remote-tracking branch 'origin/dev' into dev_
|  |  |  | 
|---|
|  |  |  | //删除因子 | 
|---|
|  |  |  | for (VersionSensorUnit versionSensorUnit : deleteList) { | 
|---|
|  |  |  | UpdateWrapper deleteOrganizationUnitAlarmWrapper = new UpdateWrapper(); | 
|---|
|  |  |  | deleteOrganizationUnitAlarmWrapper.eq("orgniazation_id",organizationId); | 
|---|
|  |  |  | deleteOrganizationUnitAlarmWrapper.eq("organization_id",organizationId); | 
|---|
|  |  |  | deleteOrganizationUnitAlarmWrapper.eq("version_id",versionId); | 
|---|
|  |  |  | deleteOrganizationUnitAlarmWrapper.eq("sensor_code",versionSensorUnit.getSensorCode()); | 
|---|
|  |  |  | deleteOrganizationUnitAlarmWrapper.set("is_delete",Constants.DELETE); | 
|---|
|  |  |  | organizationUnitAlarmMapper.update(null,deleteOrganizationUnitAlarmWrapper); | 
|---|
|  |  |  | } | 
|---|
|  |  |  | //新增因子 | 
|---|